From 73058eb94658fdcb825ea5934a06c52d445a262c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Nov 2015 16:44:43 +0100 Subject: [PATCH 001/498] xen: 4.5.1 -> 4.5.2 Excerpt from upstream release notes: This release also contains the security fixes for XSA-137, XSA-138, XSA-141 to XSA-153. XSA-139 and XSA-140 only apply to QEMU Upstream and are fixed from versions 2.3.1 and 2.4.0 of QEMU. The qemu portion of XSA-135 has also been applied to qemu-traditional. --- .../xen/{4.5.1.nix => 4.5.2.nix} | 29 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 16 insertions(+), 17 deletions(-) rename pkgs/applications/virtualization/xen/{4.5.1.nix => 4.5.2.nix} (71%) diff --git a/pkgs/applications/virtualization/xen/4.5.1.nix b/pkgs/applications/virtualization/xen/4.5.2.nix similarity index 71% rename from pkgs/applications/virtualization/xen/4.5.1.nix rename to pkgs/applications/virtualization/xen/4.5.2.nix index 3412a0bd6ec..f8f7630189f 100644 --- a/pkgs/applications/virtualization/xen/4.5.1.nix +++ b/pkgs/applications/virtualization/xen/4.5.2.nix @@ -1,14 +1,14 @@ { callPackage, fetchurl, fetchgit, ... } @ args: let - # Xen 4.5.1 - xenConfig = { - name = "xen-4.5.1"; - version = "4.5.1"; + # Xen 4.5.2 + xenConfig = rec { + version = "4.5.2"; + name = "xen-${version}"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/4.5.1/xen-4.5.1.tar.gz"; - sha256 = "0w8kbqy7zixacrpbk3yj51xx7b3f6l8ghsg3551w8ym6zka13336"; + url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; + sha256 = "1s7702zrxpsmx4vqvll4x2s762cfdiss4vgpx5s4jj7a9sn5v7jc"; }; # Sources needed to build the xen tools and tools/firmware. @@ -23,25 +23,25 @@ let } { git = { name = "ovmf"; url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; + sha256 = "1ncb8dpqzaj3s8am44jvclhby40hwczljz0a1gd282h9yr4k4sk2"; }; } ]; toolsGits = - [ # tag qemu-xen-4.5.1 + [ # tag qemu-xen-4.5.2 { git = { name = "qemu-xen"; url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; - rev = "d9552b0af21c27535cd3c8549bb31d26bbecd506"; - sha256 = "15dbz8j26wl4vs5jijhccwgd8c6wkmpj4mz899fa7i1bbh8yysfy"; + rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d"; + sha256 = "1qflb3j8qcvipavybqhi0ql7m2bx51lhzgmf7pdbls8minpvdzg2"; }; } - # tag xen-4.5.1 + # tag xen-4.5.2 { git = { name = "qemu-xen-traditional"; url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; - rev = "afaa35b4bc975b2b89ad44c481d0d7623e3d1c49"; - sha256 = "906b31cf32b52d29e521abaa76d641123bdf24f33fa53c6f109b6d7834e514be"; + rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0"; + sha256 = "14fxdsnkq729z5glkifdpz26idmn7fl38w1v97xj8cf6ifvk76cz"; }; } { git = { name = "xen-libhvm"; @@ -64,4 +64,3 @@ let }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c90e2d43c..b82452fb2e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13592,9 +13592,9 @@ let xdotool = callPackage ../tools/X11/xdotool { }; xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; - xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { }; + xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { }; xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; - xen = xen_4_5_1; + xen = xen_4_5_2; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; From 6841d5ded1bd234f9498768f083471c222b00318 Mon Sep 17 00:00:00 2001 From: Arda Xi Date: Sun, 22 Nov 2015 20:12:32 +0100 Subject: [PATCH 002/498] e19.efl: remove dependency on VLC --- pkgs/desktops/e19/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 16c934b3b3a..aa662f1ed87 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ From 0ca454570be6c55395f767a8606f29f11222ad1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Nov 2015 17:18:03 +0100 Subject: [PATCH 003/498] python pyfftw: init at 0.9.2 --- pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b41a391cce2..e82da26b811 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14226,6 +14226,38 @@ in modules // { }; }; + pyfftw = buildPythonPackage rec { + name = "pyfftw-${version}"; + version = "0.9.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz"; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; + + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + + propagatedBuildInputs = with self; [ numpy scipy ]; + + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; + + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + ''; + #+ optionalString isDarwin '' + # export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib" + #''; + + meta = { + description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + homepage = http://hgomersall.github.com/pyFFTW/; + license = with licenses; [ bsd2 bsd3 ]; + maintainer = with maintainers; [ fridh ]; + }; + }; + pyfiglet = buildPythonPackage rec { name = "pyfiglet-${version}"; version = "0.7.2"; From 104f98c12af2f3782d64f9099c694f1fad339aa2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Nov 2015 17:18:57 +0100 Subject: [PATCH 004/498] fftw: add fftwLongDouble, disable SSE2 in that case --- pkgs/development/libraries/fftw/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 2bcc1cd69a7..dfa4541e34b 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { ] ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2" + # however, not all float sizes fit + ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional stdenv.cc.isGNU "--enable-openmp"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd7e4691f40..2366ac4a35e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6318,6 +6318,7 @@ let fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; From e78fb0d59acabbd237cd5aad2513cc8bb7f723bd Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 30 Nov 2015 18:57:23 +0100 Subject: [PATCH 005/498] git-review: init at 1.25.0 This provides a git command for submitting branches to Gerrit. --- .../version-management/git-review/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/version-management/git-review/default.nix diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix new file mode 100644 index 00000000000..fb6d542f479 --- /dev/null +++ b/pkgs/applications/version-management/git-review/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pythonPackages, python} : + +pythonPackages.buildPythonPackage rec { + name = "git-review-${version}"; + version = "1.25.0"; + + # Manually set version because prb wants to get it from the git + # upstream repository (and we are installing from tarball instead) + PBR_VERSION = "${version}"; + + src = fetchurl rec { + url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; + sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; + }; + + propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ]; + + # Don't do tests because they require gerrit which is not packaged + doCheck = false; + + meta = { + homepage = "https://github.com/openstack-infra/git-review"; + description = "Tool to submit code to Gerrit"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cd747a1374..08003ee86bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11826,6 +11826,10 @@ let python = python27; }; + git-review = callPackage ../applications/version-management/git-review { + python = python27; + }; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; From 79b1e05b42152bd1f2f84774dc2aea6ce06a25ae Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 3 Dec 2015 00:02:08 +0100 Subject: [PATCH 006/498] jackaudio: compile without profiling --- pkgs/misc/jackaudio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 25fd1a5cbbf..b5748c0f832 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ --classic \ - --profile \ ${optionalString (optLibffado != null) "--firewire"} \ ${optionalString (optAlsaLib != null) "--alsa"} \ --autostart=${if (optDbus != null) then "dbus" else "classic"} \ From 474d64eecf8df4d62a1ed02f88c2b612f8e727d8 Mon Sep 17 00:00:00 2001 From: Evan Danaher Date: Wed, 2 Dec 2015 23:43:53 -0500 Subject: [PATCH 007/498] libstroke: init at version 0.5.1 --- .../libraries/libstroke/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libstroke/default.nix diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix new file mode 100644 index 00000000000..b9c4a0a36d4 --- /dev/null +++ b/pkgs/development/libraries/libstroke/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, automake, autoconf, x11}: + +stdenv.mkDerivation { + name = "libstroke-0.5.1"; + + src = fetchurl { + url = http://etla.net/libstroke/libstroke-0.5.1.tar.gz; + sha256 = "0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d"; + }; + + buildInputs = [ automake autoconf x11 ]; + + # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. + # Also, modern automake doesn't like things and returns error code 63. But it generates the file. + preConfigure = '' + rm config.sub + autoconf + automake -a || true + ''; + + meta = { + description = "libstroke, a library for simple gesture recognition"; + homepage = http://etla.net/libstroke/; + license = stdenv.lib.licenses.gpl2; + + longDescription = + '' libstroke, last updated in 2001, still successfully provides a basic + gesture recognition engine based around a 3x3 grid. It's simple and + easy to work with, and notably used by FVWM. + ''; + + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf2f907ebc..b8b7b3bec37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7438,6 +7438,8 @@ let libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libstroke = callPackage ../development/libraries/libstroke { }; + libstrophe = callPackage ../development/libraries/libstrophe { }; libspatialindex = callPackage ../development/libraries/libspatialindex { }; From 523d6846a77f14960d9541b88c24f31920c36f8a Mon Sep 17 00:00:00 2001 From: Evan Danaher Date: Wed, 2 Dec 2015 23:58:00 -0500 Subject: [PATCH 008/498] fvwm: add gestures option to use libstroke --- pkgs/applications/window-managers/fvwm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 6830e3a1c01..aded77a466d 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchurl, pkgconfig +{ gestures ? false +, stdenv, fetchurl, pkgconfig , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, librsvg, libpng, fribidi, perl +, libstroke ? null }: +assert gestures -> libstroke != null; + stdenv.mkDerivation rec { name = "fvwm-2.6.5"; @@ -15,7 +19,7 @@ stdenv.mkDerivation rec { pkgconfig cairo fontconfig freetype libXft libXcursor libXinerama libXpm librsvg libpng fribidi perl - ]; + ] ++ stdenv.lib.optional gestures libstroke; meta = { homepage = "http://fvwm.org"; From b94a2db590366f8bfd9313bae0ceb9fd2db37a66 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 27 Nov 2015 22:58:00 +0100 Subject: [PATCH 009/498] yoshimi: 1.3.6 -> 1.3.7.1 --- pkgs/applications/audio/yoshimi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index dc2fe0ba649..5d60824c3b0 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, libjack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.6"; + version = "1.3.7.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0c2y59m945rrspnwdxmixk92z9nfiayxdxh582gf15nj8bvkh1l6"; + sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa minixml zlib xorg.libpthreadstubs ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { description = "high quality software synthesizer based on ZynAddSubFX"; From 8edd15d1755f2e85580e74e7f903dcc060cd6e2d Mon Sep 17 00:00:00 2001 From: Ian Denhardt Date: Wed, 2 Dec 2015 17:27:52 -0500 Subject: [PATCH 010/498] xserver: dwm as a window manager --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/dwm.nix | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/dwm.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 31f42f5ffb9..37d3348b8a3 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -12,6 +12,7 @@ in ./bspwm.nix ./clfswm.nix ./compiz.nix + ./dwm.nix ./fluxbox.nix ./herbstluftwm.nix ./i3.nix diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix new file mode 100644 index 00000000000..a74bfce097d --- /dev/null +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.windowManager.dwm; + +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.dwm.enable = mkEnableOption "dwm"; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = singleton + { name = "dwm"; + start = + '' + ${pkgs.dwm}/bin/dwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ pkgs.dwm ]; + + }; + +} From 2c54da93ef727b366433d112e78b4d4a1bd2fb6d Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 2 Dec 2015 21:27:32 +0100 Subject: [PATCH 011/498] mapnik: init at 3.0.9 --- pkgs/development/libraries/mapnik/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 21 ++++++++++ 3 files changed, 63 insertions(+) create mode 100644 pkgs/development/libraries/mapnik/default.nix diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix new file mode 100644 index 00000000000..4f0311f9d92 --- /dev/null +++ b/pkgs/development/libraries/mapnik/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff +, libwebp, libxml2, proj, python, scons, sqlite, zlib +}: + +stdenv.mkDerivation rec { + name = "mapnik-${version}"; + version = "3.0.9"; + + src = fetchurl { + url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2"; + sha256 = "1nnkamwq4vcg4q2lbqn7cn8sannxszzjxcxsllksby055d9nfgrs"; + }; + + nativeBuildInputs = [ python scons ]; + + buildInputs = + [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff + libwebp libxml2 proj python sqlite zlib + ]; + + configurePhase = '' + scons configure PREFIX="$out" + ''; + + buildPhase = false; + + installPhase = '' + mkdir -p "$out" + scons install + ''; + + meta = with stdenv.lib; { + description = "An open source toolkit for developing mapping applications"; + homepage = http://mapnik.org; + maintainers = with maintainers; [ hrdinka ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14041573472..7d555f758b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7711,6 +7711,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + mapnik = callPackage ../development/libraries/mapnik { }; + matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab405e70af8..e10735430ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5075,6 +5075,27 @@ in modules // { }; }; + python-mapnik = buildPythonPackage { + name = "python-mapnik-fae6388"; + + src = pkgs.fetchgit { + url = https://github.com/mapnik/python-mapnik.git; + rev = "fae63881ed0945829e73f711d52740240b740936"; + sha256 = "13i9zsy0dk9pa947vfq26a3nrn1ddknqliyb0ljcmi5w5x0z758k"; + }; + + disabled = isPyPy; + doCheck = false; # doesn't find needed test data files + buildInputs = with pkgs; [ boost harfbuzz icu mapnik ]; + propagatedBuildInputs = with self; [ pillow pycairo ]; + + meta = with stdenv.lib; { + description = "Python bindings for Mapnik"; + homepage = http://mapnik.org; + license = licenses.lgpl21; + }; + }; + mwlib = buildPythonPackage rec { version = "0.15.15"; name = "mwlib-${version}"; From 9f05627d689041fd8f7db7dd8762df2c07f1aadd Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 4 Dec 2015 20:39:19 +0100 Subject: [PATCH 012/498] =?UTF-8?q?gpaste:=203.16.3=20=E2=86=92=203.18.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix index dee9caf444c..690d0ac2006 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.2"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib From 97ccbb94988523a106e763ba76c424d5aec52df7 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 5 Dec 2015 11:39:50 +0100 Subject: [PATCH 013/498] =?UTF-8?q?offlineimap:=206.5.7=20=E2=86=92=206.6.?= =?UTF-8?q?0,=20fixes=20#11481?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 298e2251368..e3e31e5408b 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.7"; + version = "6.6.0"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp"; + sha256 = "1x33zxjm3y2p54lbcsgflrs6v2zq785y2k0xi6xia6akrvjmh4n4"; }; doCheck = false; From 71aff7006c3b49704d63459f4027845a28a79b99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Dec 2015 10:23:03 +0100 Subject: [PATCH 014/498] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/02a00be50f5307163687bac2d357fe4555076aa6 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/2c186df615cfe55a07a0bb095c5901e987aa964a - LTS Haskell: https://github.com/fpco/lts-haskell/commit/57dab1c9974199e11130c3da70ffa31480a9ca37 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c3ba1c0c159d1b77cdb8fd3f338f778d90403f4b --- .../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 | 5 + .../haskell-modules/configuration-lts-1.1.nix | 5 + .../configuration-lts-1.10.nix | 6 + .../configuration-lts-1.11.nix | 6 + .../configuration-lts-1.12.nix | 6 + .../configuration-lts-1.13.nix | 6 + .../configuration-lts-1.14.nix | 6 + .../configuration-lts-1.15.nix | 6 + .../haskell-modules/configuration-lts-1.2.nix | 5 + .../haskell-modules/configuration-lts-1.4.nix | 5 + .../haskell-modules/configuration-lts-1.5.nix | 5 + .../haskell-modules/configuration-lts-1.7.nix | 5 + .../haskell-modules/configuration-lts-1.8.nix | 5 + .../haskell-modules/configuration-lts-1.9.nix | 5 + .../haskell-modules/configuration-lts-2.0.nix | 8 + .../haskell-modules/configuration-lts-2.1.nix | 8 + .../configuration-lts-2.10.nix | 8 + .../configuration-lts-2.11.nix | 8 + .../configuration-lts-2.12.nix | 8 + .../configuration-lts-2.13.nix | 8 + .../configuration-lts-2.14.nix | 8 + .../configuration-lts-2.15.nix | 8 + .../configuration-lts-2.16.nix | 8 + .../configuration-lts-2.17.nix | 8 + .../configuration-lts-2.18.nix | 8 + .../configuration-lts-2.19.nix | 8 + .../haskell-modules/configuration-lts-2.2.nix | 8 + .../configuration-lts-2.20.nix | 8 + .../configuration-lts-2.21.nix | 8 + .../configuration-lts-2.22.nix | 8 + .../haskell-modules/configuration-lts-2.3.nix | 8 + .../haskell-modules/configuration-lts-2.4.nix | 8 + .../haskell-modules/configuration-lts-2.5.nix | 8 + .../haskell-modules/configuration-lts-2.6.nix | 8 + .../haskell-modules/configuration-lts-2.7.nix | 8 + .../haskell-modules/configuration-lts-2.8.nix | 8 + .../haskell-modules/configuration-lts-2.9.nix | 8 + .../haskell-modules/configuration-lts-3.0.nix | 6 + .../haskell-modules/configuration-lts-3.1.nix | 6 + .../configuration-lts-3.10.nix | 6 + .../configuration-lts-3.11.nix | 6 + .../configuration-lts-3.12.nix | 6 + .../configuration-lts-3.13.nix | 6 + .../configuration-lts-3.14.nix | 6 + .../configuration-lts-3.15.nix | 8 + .../configuration-lts-3.16.nix | 8 + .../haskell-modules/configuration-lts-3.2.nix | 6 + .../haskell-modules/configuration-lts-3.3.nix | 6 + .../haskell-modules/configuration-lts-3.4.nix | 6 + .../haskell-modules/configuration-lts-3.5.nix | 6 + .../haskell-modules/configuration-lts-3.6.nix | 6 + .../haskell-modules/configuration-lts-3.7.nix | 6 + .../haskell-modules/configuration-lts-3.8.nix | 6 + .../haskell-modules/configuration-lts-3.9.nix | 6 + .../haskell-modules/hackage-packages.nix | 334 +++++++++++++++--- 63 files changed, 699 insertions(+), 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 52d479315eb..39ed88df521 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -2508,6 +2508,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3203,6 +3204,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7172,6 +7174,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7304,6 +7307,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8390,6 +8394,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index e5f36bb7570..ae64a29c7f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index e3d0cdb9572..a84c1373c7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 515b24f5a66..d16313afef2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index a0d8051eb01..5dd14262adf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3201,6 +3202,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7167,6 +7169,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7299,6 +7302,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8384,6 +8388,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 15fb8882f0d..8decd57903f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3201,6 +3202,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7167,6 +7169,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7299,6 +7302,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8384,6 +8388,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 093c4f733ef..3b2b2314cea 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -2504,6 +2504,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3198,6 +3199,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7161,6 +7163,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7293,6 +7296,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8378,6 +8382,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 6220b6a28d9..642fc7fa977 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -2504,6 +2504,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3198,6 +3199,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7161,6 +7163,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7293,6 +7296,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8378,6 +8382,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index faebc05bd3c..8dca42ee9b5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -2495,6 +2495,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3188,6 +3189,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7146,6 +7148,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7278,6 +7281,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8361,6 +8365,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index d13ec626bd4..605cb0efc2b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -2492,6 +2492,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3184,6 +3185,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7136,6 +7138,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7268,6 +7271,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8346,6 +8350,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index b1a2cad2352..650752ee5ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3175,6 +3176,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6394,6 +6396,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7105,6 +7108,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7236,6 +7240,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8308,6 +8313,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 5263c6d9b86..74dbf8771c1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3174,6 +3175,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6390,6 +6392,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7101,6 +7104,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7232,6 +7236,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8304,6 +8309,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 52b2b12117d..c11b1e51c56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3174,6 +3175,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6389,6 +6391,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7100,6 +7103,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7231,6 +7235,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8301,6 +8306,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 826a3070e60..91daa23e07f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3173,6 +3174,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6387,6 +6389,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7098,6 +7101,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7229,6 +7233,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8298,6 +8303,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 7e52c6eea83..d18305e2377 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -2483,6 +2483,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3170,6 +3171,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6380,6 +6382,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7090,6 +7093,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7221,6 +7225,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8290,6 +8295,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 2c84f74b753..1a030949d04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -2479,6 +2479,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3165,6 +3166,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6373,6 +6375,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7081,6 +7084,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7212,6 +7216,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8279,6 +8284,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 9e6d809f2b4..499205c7962 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -2490,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3182,6 +3183,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7130,6 +7132,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7262,6 +7265,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8340,6 +8344,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index dba69f1dec4..e6c9400fe95 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -2489,6 +2489,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3180,6 +3181,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7125,6 +7127,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7257,6 +7260,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8334,6 +8338,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 29c37ff9e46..99b5a6662d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3179,6 +3180,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7123,6 +7125,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7255,6 +7258,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8330,6 +8334,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 56bb92b1892..dac91f75f47 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3179,6 +3180,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7117,6 +7119,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7249,6 +7252,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8324,6 +8328,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 40ee1cf5740..5415b132255 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3177,6 +3178,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7112,6 +7114,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7244,6 +7247,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8318,6 +8322,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 13b6ba12211..76d5755dff0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3177,6 +3178,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7109,6 +7111,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7241,6 +7244,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8315,6 +8319,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 2a316609484..f920f0dfcc1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1692,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2460,6 +2461,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3141,6 +3143,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4895,6 +4898,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6312,6 +6316,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7018,6 +7023,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7149,6 +7155,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8208,6 +8215,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 9edb5a2c836..a40332c2785 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1692,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2459,6 +2460,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3140,6 +3142,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4893,6 +4896,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6310,6 +6314,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7016,6 +7021,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7147,6 +7153,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8205,6 +8212,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 491de8d0d0e..998b724d6a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1683,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2444,6 +2445,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3121,6 +3123,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4862,6 +4865,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6264,6 +6268,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6967,6 +6972,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7097,6 +7103,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8144,6 +8151,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 04508eb6adc..2f9fdcace95 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4857,6 +4860,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6257,6 +6261,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6959,6 +6964,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7089,6 +7095,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8134,6 +8141,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 2a1cbd735d9..30bda422075 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4857,6 +4860,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6257,6 +6261,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6958,6 +6963,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7088,6 +7094,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8133,6 +8140,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 0adb52db528..c2f5925a80e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4855,6 +4858,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6254,6 +6258,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6955,6 +6960,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7085,6 +7091,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8130,6 +8137,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 9545f51a8ab..b1a58da2e4d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1681,6 +1681,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2442,6 +2443,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3118,6 +3120,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4852,6 +4855,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6251,6 +6255,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6951,6 +6956,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7080,6 +7086,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8125,6 +8132,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 495f8c59c7c..2635c5769c7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1681,6 +1681,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2442,6 +2443,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3117,6 +3119,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4851,6 +4854,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6247,6 +6251,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6947,6 +6952,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7076,6 +7082,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8120,6 +8127,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 69008eef6f8..ab08a75c97d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1680,6 +1680,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2439,6 +2440,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3111,6 +3113,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4844,6 +4847,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6239,6 +6243,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6939,6 +6944,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7068,6 +7074,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8111,6 +8118,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index f349c962376..68e42372a93 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2436,6 +2437,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3106,6 +3108,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4837,6 +4840,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6231,6 +6235,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6930,6 +6935,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7059,6 +7065,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8102,6 +8109,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index afcbcfdba13..0f156cc4440 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2434,6 +2435,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3103,6 +3105,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4832,6 +4835,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6224,6 +6228,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6923,6 +6928,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7052,6 +7058,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8094,6 +8101,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 5742e57eeed..a147151148c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2434,6 +2435,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3102,6 +3104,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4831,6 +4834,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6221,6 +6225,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6920,6 +6925,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7049,6 +7055,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8089,6 +8096,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index f9f9af3edef..20162f4a968 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1691,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2456,6 +2457,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3137,6 +3139,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4889,6 +4892,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6305,6 +6309,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7011,6 +7016,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7142,6 +7148,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8200,6 +8207,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index a0ac730e2e6..51b222c6949 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2433,6 +2434,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3100,6 +3102,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4828,6 +4831,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6217,6 +6221,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6916,6 +6921,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7044,6 +7050,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8084,6 +8091,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 455e9b3cbf8..bb0ac6243f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2433,6 +2434,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3100,6 +3102,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4827,6 +4830,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6214,6 +6218,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6913,6 +6918,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7041,6 +7047,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8079,6 +8086,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 5dbf1176db5..205ce1a3584 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1677,6 +1677,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2432,6 +2433,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3099,6 +3101,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4824,6 +4827,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6210,6 +6214,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6909,6 +6914,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7037,6 +7043,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8075,6 +8082,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 519d1221af5..46a8defbbc3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1691,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2456,6 +2457,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3136,6 +3138,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4887,6 +4890,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6303,6 +6307,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7009,6 +7014,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7139,6 +7145,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8197,6 +8204,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index a94a7d2649f..605e7a591ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1690,6 +1690,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2455,6 +2456,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3135,6 +3137,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4886,6 +4889,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6299,6 +6303,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7004,6 +7009,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7134,6 +7140,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8192,6 +8199,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 4e538d285ef..499eb7c9d36 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1690,6 +1690,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2454,6 +2455,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3134,6 +3136,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4885,6 +4888,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6297,6 +6301,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7002,6 +7007,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7132,6 +7138,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8189,6 +8196,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index dba6827cb90..69f0f1dd7d0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1687,6 +1687,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2451,6 +2452,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3131,6 +3133,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4880,6 +4883,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6291,6 +6295,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6996,6 +7001,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7126,6 +7132,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8181,6 +8188,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 476f657f88a..c98a21f0c1b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1686,6 +1686,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2450,6 +2451,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3130,6 +3132,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4879,6 +4882,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6290,6 +6294,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6995,6 +7000,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7125,6 +7131,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8180,6 +8187,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index fb68e8624d9..d3d3f51d088 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1685,6 +1685,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2449,6 +2450,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3128,6 +3130,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4875,6 +4878,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6286,6 +6290,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6990,6 +6995,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7120,6 +7126,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8172,6 +8179,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 52601c8d85e..7cfcc222592 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1683,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2446,6 +2447,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3123,6 +3125,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4867,6 +4870,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6274,6 +6278,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6978,6 +6983,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7108,6 +7114,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8156,6 +8163,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 59f8cf22a0d..6c1a2b2bb11 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -2352,6 +2352,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2991,6 +2992,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5992,6 +5994,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6675,6 +6678,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6801,6 +6805,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7802,6 +7807,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 77ffcd825bb..b7df56e7e36 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -2350,6 +2350,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2986,6 +2987,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5983,6 +5985,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6665,6 +6668,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6791,6 +6795,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7791,6 +7796,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 5653c720f30..4e896225942 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -2317,6 +2317,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2929,6 +2930,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5882,6 +5884,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6544,6 +6547,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6668,6 +6672,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7649,6 +7654,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 7dacd13b53e..0c9c0cf1c09 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -2315,6 +2315,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2926,6 +2927,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5874,6 +5876,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6535,6 +6538,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6658,6 +6662,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7638,6 +7643,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 062cb92bb5b..c0cc2894018 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -2310,6 +2310,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2921,6 +2922,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5865,6 +5867,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6526,6 +6529,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6649,6 +6653,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7625,6 +7630,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index c0a7c2cae54..14280d9ef81 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -2310,6 +2310,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2921,6 +2922,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5861,6 +5863,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6522,6 +6525,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6645,6 +6649,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7620,6 +7625,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 70429d828ec..e28ff3719ac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -2305,6 +2305,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2911,6 +2912,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5846,6 +5848,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6507,6 +6510,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6630,6 +6634,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7603,6 +7608,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 37d26eb294b..387317ea794 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -2304,6 +2304,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2910,6 +2911,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4357,6 +4359,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -5839,6 +5842,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6498,6 +6502,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6621,6 +6626,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6808,6 +6814,7 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -7592,6 +7599,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 39be674d51a..fff8eb6b220 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -2302,6 +2302,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2907,6 +2908,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4353,6 +4355,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -5830,6 +5833,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6486,6 +6490,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6609,6 +6614,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6796,6 +6802,7 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -7576,6 +7583,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index e999d035891..220977e57c8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -2347,6 +2347,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2982,6 +2983,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5974,6 +5976,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6653,6 +6656,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6778,6 +6782,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7776,6 +7781,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 0da13e057b7..e9ccb4b7e2b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -2343,6 +2343,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2977,6 +2978,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5966,6 +5968,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6644,6 +6647,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6769,6 +6773,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7764,6 +7769,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index dc54a3847b2..5bb6b8988fd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -2342,6 +2342,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2976,6 +2977,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5965,6 +5967,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6642,6 +6645,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6767,6 +6771,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7761,6 +7766,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 27acc39fd64..f757ca0e6d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -2339,6 +2339,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2971,6 +2972,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5950,6 +5952,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6624,6 +6627,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6749,6 +6753,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7740,6 +7745,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 76e8151ea55..f9686a9ea1b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -2337,6 +2337,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2966,6 +2967,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5936,6 +5938,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6610,6 +6613,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6735,6 +6739,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7725,6 +7730,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 683b6aa1e04..75b5a3c260e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -2331,6 +2331,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2956,6 +2957,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5918,6 +5920,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6589,6 +6592,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6714,6 +6718,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7701,6 +7706,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index ad2042e5406..60bfa401278 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -2325,6 +2325,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2945,6 +2946,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5905,6 +5907,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6573,6 +6576,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6698,6 +6702,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7683,6 +7688,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index dfaf44cdce4..726d3c38d96 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -2321,6 +2321,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2937,6 +2938,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5896,6 +5898,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6564,6 +6567,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6689,6 +6693,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7674,6 +7679,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1c153707c7e..435d7b37c41 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1158,6 +1158,7 @@ self: { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -6357,7 +6358,7 @@ self: { libraryToolDepends = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPX" = callPackage @@ -10072,6 +10073,7 @@ self: { array base containers directory filepath FPretty libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; + jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -10738,8 +10740,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.4.1.0"; - sha256 = "cbe486ae239e97deeccd6194be2e9933291778f6dd3a0bed7af60caa361ef44f"; + version = "0.4.1.1"; + sha256 = "eda9176e35ae9988770af216ba69d7a714f1baec7344789c03f3eaec0a4af423"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -12597,7 +12599,7 @@ self: { doHaddock = false; description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MicrosoftTranslator" = callPackage @@ -18956,7 +18958,7 @@ self: { ]; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Weather" = callPackage @@ -19311,6 +19313,7 @@ self: { homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WordNet" = callPackage @@ -22698,7 +22701,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; "alarmclock_0_2_0_5" = callPackage @@ -35241,6 +35244,7 @@ self: { ]; description = "A collection of bioinformatics tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "biophd" = callPackage @@ -36018,7 +36022,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blank-canvas" = callPackage + "blank-canvas_0_5" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, colour , containers, data-default-class, http-types, kansas-comet, scotty , stm, text, transformers, vector, wai, wai-extra, warp @@ -36041,6 +36045,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, shake, stm + , text, text-show, time, transformers, unix, vector, wai, wai-extra + , warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6"; + sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty stm text text-show transformers vector wai wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -52904,6 +52933,7 @@ self: { homepage = "https://github.com/simhu/cubical"; description = "Implementation of Univalence in Cubical Sets"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicbezier" = callPackage @@ -55233,6 +55263,21 @@ self: { license = "GPL"; }) {}; + "dawdle" = callPackage + ({ mkDerivation, base, filepath, parsec, pretty, text, time }: + mkDerivation { + pname = "dawdle"; + version = "0.1.0.1"; + sha256 = "d6738e621934621cd2a84c108cfa8d940b4c8f6c1e66b15aceb61a711cf9d5e7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec pretty text time ]; + executableHaskellDepends = [ base filepath parsec pretty text ]; + homepage = "https://github.com/arnons1/dawdle"; + description = "Generates DDL suggestions based on a CSV file"; + license = stdenv.lib.licenses.mit; + }) {}; + "dawg" = callPackage ({ mkDerivation, base, binary, containers, mtl, transformers , vector, vector-binary @@ -62059,6 +62104,7 @@ self: { testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; + jailbreak = true; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -62641,7 +62687,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-linker-template" = callPackage @@ -64305,6 +64351,7 @@ self: { jailbreak = true; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-make" = callPackage @@ -71242,8 +71289,8 @@ self: { }: mkDerivation { pname = "fn"; - version = "0.2.0.0"; - sha256 = "56ce8492016a576e3cb15283984756a00c1a4c3784ee9861fd75f3ddfe290841"; + version = "0.2.0.1"; + sha256 = "8f39132f14a82c280f74b799f39367d9fc7566c9827bb1d4cc10e837ce37e95c"; libraryHaskellDepends = [ base blaze-builder bytestring directory filepath http-types text unordered-containers wai wai-extra @@ -71252,7 +71299,7 @@ self: { base directory filepath hspec http-types text unordered-containers wai wai-extra ]; - homepage = "http://github.cxom/dbp/fn#readme"; + homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; }) {}; @@ -72109,6 +72156,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "formura" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, either, lattices + , lens, mmorph, mtl, parsers, QuickCheck, text, trifecta, vector + }: + mkDerivation { + pname = "formura"; + version = "1.0"; + sha256 = "85f87237328c583f9178a37223def73ac394be919cbb91896c54340a69cadc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base containers either lattices lens mmorph mtl + parsers QuickCheck text trifecta vector + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers lens text trifecta + ]; + homepage = "http://nushio3.github.io"; + description = "Formura is a simple language to describe stencil computation"; + license = stdenv.lib.licenses.mit; + }) {}; + "forth-hll" = callPackage ({ mkDerivation, array-forth, base, free, mtl }: mkDerivation { @@ -72187,6 +72256,7 @@ self: { homepage = "https://github.com/tonymorris/foscam-sort"; description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fountain" = callPackage @@ -72579,6 +72649,7 @@ self: { homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Provides free functors that are adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-game" = callPackage @@ -85400,6 +85471,7 @@ self: { homepage = "https://github.com/utdemir/handsy"; description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hangman" = callPackage @@ -86476,6 +86548,7 @@ self: { ]; description = "A web service specification compiler that generates implementation and tests"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haroonga" = callPackage @@ -86920,6 +86993,7 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashmap" = callPackage @@ -87547,15 +87621,15 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, directory + ({ mkDerivation, base, bytestring, containers, directory , file-embed, filepath, free, glib, gobjectIntrospection , haskell-gi-base, mtl, pretty-show, process, safe, text , transformers, xdg-basedir, xml-conduit }: mkDerivation { pname = "haskell-gi"; - version = "0.10.1"; - sha256 = "dc62929c8018eed13acb99be501298b172345bd4f7d93024cbc59c4fc84fa86a"; + version = "0.10.2"; + sha256 = "d6e6808615a03b69b0653f10f6634315ccc8e3e57b108175a043b708e3608163"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87564,7 +87638,6 @@ self: { xdg-basedir xml-conduit ]; executablePkgconfigDepends = [ glib gobjectIntrospection ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; @@ -87577,8 +87650,8 @@ self: { }: mkDerivation { pname = "haskell-gi-base"; - version = "0.10"; - sha256 = "54631b2ae430ded0eee1542fc73f3468b228058e35fbc3432db54a9f9a4c88ad"; + version = "0.10.1"; + sha256 = "04457204453324cb8cea89d86159153bc9c141d8371212c49fa379aa06f7cde0"; libraryHaskellDepends = [ base bytestring containers text transformers ]; @@ -88106,23 +88179,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_17_0" = callPackage + "haskell-src-exts_1_17_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , syb, tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.17.0"; - sha256 = "398f668f690a7a766c7338b82d241581ff6dfbd9aa166712911535ebd3f03122"; - revision = "1"; - editedCabalFile = "ca48ccd93dd2abf02c84a35eefb88402442c45eaa45524dce1f7396ec334e31c"; + version = "1.17.1"; + sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ base containers directory filepath mtl pretty-show smallcheck syb tasty tasty-golden tasty-smallcheck ]; + jailbreak = true; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -109339,7 +109411,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "incremental-parser" = callPackage + "incremental-parser_0_2_4" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -109354,9 +109426,10 @@ self: { homepage = "http://patch-tag.com/r/blamario/incremental-parser/wiki/"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "incremental-parser_0_2_4_1" = callPackage + "incremental-parser" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -109371,7 +109444,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -109725,6 +109797,7 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -110688,7 +110761,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time transformers vector zlib zlib-bindings ]; - doCheck = false; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114112,7 +114184,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kansas-comet" = callPackage + "kansas-comet_0_3_1" = callPackage ({ mkDerivation, aeson, base, containers, data-default, scotty, stm , text, time, transformers, unordered-containers }: @@ -114131,6 +114203,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kansas-comet" = callPackage + ({ mkDerivation, aeson, base, containers, data-default-class + , scotty, stm, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "kansas-comet"; + version = "0.4"; + sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; + libraryHaskellDepends = [ + aeson base containers data-default-class scotty stm text time + transformers unordered-containers + ]; + homepage = "https://github.com/ku-fpg/kansas-comet/"; + description = "A JavaScript push mechanism based on the comet idiom"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kansas-lava" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers , data-default, data-reify, directory, dotgen, filepath, netlist @@ -114582,7 +114672,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -119401,8 +119491,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.7"; - sha256 = "5dfcfcba1005a4ac411192f2a8138100534ec7c2e576f46e4acb6367e89dbc33"; + version = "1.8"; + sha256 = "34377397255a7fd2b1e77ee25d9e865e1bb7e8ce394519458f2d819727d59878"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -120772,6 +120862,7 @@ self: { homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -137356,6 +137447,7 @@ self: { base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers ]; + jailbreak = true; homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; description = "Opaleye wrapped up in classy MTL attire"; license = stdenv.lib.licenses.mit; @@ -137404,6 +137496,7 @@ self: { executableHaskellDepends = [ base opaleye postgresql-simple product-profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; @@ -137529,6 +137622,7 @@ self: { homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; description = "Haskell Bindings for the AtomSpace"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {atomspace-cwrapper = null;}; "opencv-raw" = callPackage @@ -138958,6 +139052,7 @@ self: { ]; description = "Serialization library for GHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packunused" = callPackage @@ -143057,6 +143152,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143079,6 +143175,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143101,6 +143198,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143123,6 +143221,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143145,6 +143244,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143167,6 +143267,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143189,6 +143290,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143211,6 +143313,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143233,6 +143336,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143255,6 +143359,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143277,6 +143382,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143299,6 +143405,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -147625,7 +147732,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple" = callPackage + "postgresql-simple_0_4_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , blaze-builder, blaze-textual, bytestring, case-insensitive , containers, cryptohash, hashable, HUnit, postgresql-libpq @@ -147648,9 +147755,10 @@ self: { doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple_0_5_1_1" = callPackage + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, hashable, HUnit, postgresql-libpq, scientific @@ -147669,9 +147777,9 @@ self: { aeson base base16-bytestring bytestring containers cryptohash HUnit text time vector ]; + doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -148313,8 +148421,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-edsl"; - version = "0.1.2"; - sha256 = "97e884220ca2c37e913b8b73f148f0cb3e822a3b6cf89d88e25b7d4d9e1cd934"; + version = "0.3"; + sha256 = "8250585549ad9c64c2b0407157cacb8a4a2dd0dcf77c8de4b005adddf2b98008"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/prelude-edsl"; description = "An EDSL-motivated subset of the Prelude"; @@ -154151,6 +154259,7 @@ self: { homepage = "http://github.com/NicolasT/reedsolomon"; description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {reedsolomon = null;}; "reenact" = callPackage @@ -164585,6 +164694,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "setgame" = callPackage + ({ mkDerivation, base, random, vty }: + mkDerivation { + pname = "setgame"; + version = "1.1"; + sha256 = "34b0c18e84023bc1785a18386663be136ac3d02f901cf8106942d4d3c89a22c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random vty ]; + executableHaskellDepends = [ base ]; + description = "A console interface to the game of Set"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "setlocale" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167776,6 +167899,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skemmtun" = callPackage + ({ mkDerivation, base, bytestring, data-default, http-client + , http-types, lens, text, time, wreq, xml-conduit + }: + mkDerivation { + pname = "skemmtun"; + version = "0.1.0.0"; + sha256 = "9602063e569741878f18dc1820a7281a3387ff6fdfdc394e32511f2abaab6c11"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring data-default http-client http-types lens text time + wreq xml-conduit + ]; + homepage = "https://github.com/nyorem/skemmtun"; + description = "A MyAnimeList.net client."; + license = stdenv.lib.licenses.mit; + }) {}; + "skype4hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, lifted-base , monad-control, mtl, stm, text, time, transformers-base, word8 @@ -169632,6 +169774,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-influxdb"; description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-lss" = callPackage @@ -172583,7 +172726,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_8_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-tagged, blaze-builder, byteable, bytestring, Cabal @@ -172648,6 +172791,74 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-tagged, blaze-builder, byteable, bytestring, Cabal + , conduit, conduit-combinators, conduit-extra, containers + , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance + , either, email-validate, enclosed-exceptions, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify, gitrev + , hashable, hastache, hpc, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, project-template + , QuickCheck, resourcet, retry, safe, semigroups, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unix-compat + , unordered-containers, uuid, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.10.0"; + sha256 = "9b730c2b4b7bb87fc70ccbf0bab0e2fe6f0775644b36972b4dea9088cbcab979"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-tagged blaze-builder + byteable bytestring Cabal conduit conduit-combinators conduit-extra + containers cryptohash cryptohash-conduit deepseq directory + edit-distance either email-validate enclosed-exceptions exceptions + extra fast-logger file-embed filelock filepath fsnotify hashable + hastache hpc http-client http-client-tls http-conduit http-types + lifted-base monad-control monad-logger monad-loops mtl old-locale + optparse-applicative path persistent persistent-sqlite + persistent-template pretty process project-template resourcet retry + safe semigroups split stm streaming-commons tar template-haskell + temporary text time transformers transformers-base unix unix-compat + unordered-containers uuid vector vector-binary-instances void word8 + yaml zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "http://haskellstack.org"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -182752,6 +182963,7 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadscope" = callPackage @@ -187388,8 +187600,8 @@ self: { }: mkDerivation { pname = "typography-geometry"; - version = "1.0.0"; - sha256 = "0ec6c98ddd23dec27f6511b917b896f4b7ef3102629d1ceb92d5f376076478ef"; + version = "1.0.0.1"; + sha256 = "edaeafb60126be19f0e4fdda54be89b92317dd03b59e9d8b6f119064c1642ad7"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; @@ -191901,7 +192113,7 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-json" = callPackage @@ -191934,6 +192146,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vinyl-vectors" = callPackage + ({ mkDerivation, base, constraints, primitive, text, vector, vinyl + }: + mkDerivation { + pname = "vinyl-vectors"; + version = "0.1.0.3"; + sha256 = "e439e9b8045d71c898a7aad388322594cc52399b60588bfcec1116b2cb179afe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base constraints primitive text vector vinyl + ]; + homepage = "http://github.com/andrewthad/vinyl-vectors"; + description = "Vectors for vinyl vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "virthualenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, mtl, process, safe, split @@ -194153,6 +194382,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.0"; sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58"; + revision = "1"; + editedCabalFile = "b365b6463ecd16b5e9782776e365b1441109a2909ff42873b7fd5862b1397eb7"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash directory expiring-cache-map filepath http-types mime-types mtl old-locale @@ -203088,6 +203319,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-auth-oauth2_0_1_5" = callPackage + ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 + , http-client, http-conduit, http-types, lifted-base, network-uri + , random, text, transformers, vector, yesod-auth, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.1.5"; + sha256 = "7678dcd4ed18ffb502601cdc069674260ae10019f9619c69a1a7f90aadc88768"; + libraryHaskellDepends = [ + aeson authenticate base bytestring hoauth2 http-client http-conduit + http-types lifted-base network-uri random text transformers vector + yesod-auth yesod-core yesod-form + ]; + homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; + description = "OAuth 2.0 authentication plugins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-pam" = callPackage ({ mkDerivation, base, hamlet, pam, text, yesod-auth, yesod-core , yesod-form @@ -204955,8 +205207,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.16"; - sha256 = "26bab99551e7f6318f367947606129a9360f3a00e04c3ed5d783de9878ebd268"; + version = "1.4.17"; + sha256 = "954f0851ec388ef9b9009e087d7b8c214481f7e5bd4c3dff2828030780d0eadf"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit From 2a3e9dfdd458d83062cbe2902fdb672619259fc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Dec 2015 10:21:32 +0100 Subject: [PATCH 015/498] configuration-hackage2nix.yaml: update list of broken builds --- .../configuration-hackage2nix.yaml | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7d80392944c..d5bc64a4f6d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -204,6 +204,7 @@ dont-distribute-packages: ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] alea: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -221,7 +222,6 @@ dont-distribute-packages: altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -423,6 +423,7 @@ dont-distribute-packages: BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] + bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -461,6 +462,7 @@ dont-distribute-packages: Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + BNFC: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -788,6 +790,7 @@ dont-distribute-packages: ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -986,7 +989,7 @@ dont-distribute-packages: Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-graph: [ x86_64-darwin ] + dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1025,6 +1028,7 @@ dont-distribute-packages: electrum-mnemonic: [ i686-linux ] elerea-examples: [ x86_64-darwin ] elerea-sdl: [ x86_64-darwin ] + elm-init: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ x86_64-darwin ] email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1188,6 +1192,7 @@ dont-distribute-packages: forml: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1197,6 +1202,7 @@ dont-distribute-packages: frame-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freenect: [ x86_64-darwin ] @@ -1353,7 +1359,7 @@ dont-distribute-packages: gloss-sodium: [ x86_64-darwin ] gloss: [ x86_64-darwin ] GLURaw: [ x86_64-darwin ] - GLUtil: [ x86_64-darwin ] + GLUtil: [ i686-linux, x86_64-linux, x86_64-darwin ] gluturtle: [ x86_64-darwin ] GLUT: [ x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1506,6 +1512,7 @@ dont-distribute-packages: hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] + handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1539,6 +1546,7 @@ dont-distribute-packages: HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] + harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1554,6 +1562,7 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] haskakafka: [ x86_64-darwin ] @@ -2128,6 +2137,7 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + influxdb: [ 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-c-cpp: [ x86_64-darwin ] @@ -2244,8 +2254,6 @@ dont-distribute-packages: keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ x86_64-darwin ] keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2385,6 +2393,7 @@ dont-distribute-packages: LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-evdev: [ x86_64-darwin ] linux-file-extents: [ x86_64-darwin ] @@ -2533,7 +2542,7 @@ dont-distribute-packages: mfsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] - Michelangelo: [ x86_64-darwin ] + Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-alsa: [ x86_64-darwin ] midimory: [ x86_64-darwin ] @@ -2772,6 +2781,7 @@ dont-distribute-packages: OpenAL: [ x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + opencog-atomspace: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2806,6 +2816,7 @@ dont-distribute-packages: ot: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + packman: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] pam: [ x86_64-darwin ] @@ -3089,6 +3100,7 @@ dont-distribute-packages: recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] + reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3388,6 +3400,7 @@ dont-distribute-packages: snaplet-haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-lss: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3613,6 +3626,7 @@ dont-distribute-packages: th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] + threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3815,7 +3829,7 @@ dont-distribute-packages: vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-gl: [ x86_64-darwin ] + vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3859,7 +3873,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] - WaveFront: [ x86_64-darwin ] + WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3904,6 +3918,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] word24: [ i686-linux, x86_64-linux, x86_64-darwin ] + WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] From 174d892e0c935631d91b31c5c0e9ff8c6969ced3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 2 Dec 2015 20:42:25 +0100 Subject: [PATCH 016/498] perl-HTML-TableExtract: 2.11 -> 2.13 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 711ac37970e..59e7ae2b2a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5304,11 +5304,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser ]; }; - HTMLTableExtract = buildPerlPackage { - name = "HTML-TableExtract-2.11"; + HTMLTableExtract = buildPerlPackage rec { + name = "HTML-TableExtract-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.11.tar.gz; - sha256 = "1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee"; + url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; + sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; }; From 68a1b2411ad7f5d9ae593d5520a463ae18bcbf42 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 5 Dec 2015 15:52:15 +0100 Subject: [PATCH 017/498] zsh: 5.1.1 -> 5.2 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 7b12ab7cab8..5ce686cb8fc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.1.1"; + version = "5.2"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0p99dr7kck0a6im1w9qiiz2ai78mgy53gbbn87bam9ya2885gf05"; + sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl"; + sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; }; buildInputs = [ ncurses coreutils pcre ]; From 30954fc155ce46ed754056460fe7f4d63ce94254 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 5 Dec 2015 13:12:25 +0000 Subject: [PATCH 018/498] lib: add myself to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 54e10e5cf8c..84f6b0094c6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -218,6 +218,7 @@ olcai = "Erik Timan "; orbitz = "Malcolm Matalka "; osener = "Ozan Sener "; + oxij = "Jan Malakhovski "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; From 3ef66919b6b7e63cba46ba48986f917bfd3515d5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 5 Dec 2015 13:13:18 +0000 Subject: [PATCH 019/498] cmus: 2.6.0 -> 2.7.0, add a maintainer --- pkgs/applications/audio/cmus/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a5cfdf227bb..141d7ae0781 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: +{ stdenv, fetchFromGitHub, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.6.0"; + version = "2.7.0"; - src = fetchgit { - url = https://github.com/cmus/cmus.git; - rev = "46b71032da827d22d4fae5bf2afcc4c9afef568c"; - sha256 = "1hkqifll5ryf3ljp3w1dxz1p8m6rk34fpazc6vwavis6ga310hka"; + src = fetchFromGitHub { + owner = "cmus"; + repo = "cmus"; + rev = "0306cc74c5073a85cf8619c61da5b94a3f863eaa"; + sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728"; }; configurePhase = "./configure prefix=$out"; @@ -18,5 +19,6 @@ stdenv.mkDerivation rec { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.oxij ]; }; } From 74724837d63c2121c5b08300a28bfec9aaa0401f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 5 Dec 2015 13:19:29 +0000 Subject: [PATCH 020/498] cmus: rewrite expression, add more options, fixes #11483 --- pkgs/applications/audio/cmus/default.nix | 102 +++++++++++++++++- .../audio/cmus/option-debugging.patch | 42 ++++++++ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 147 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/audio/cmus/option-debugging.patch diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 141d7ae0781..4aba1a53075 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,95 @@ -{ stdenv, fetchFromGitHub, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: +{ stdenv, fetchFromGitHub, ncurses, pkgconfig + +, alsaSupport ? stdenv.isLinux, alsaLib ? null +# simple fallback for everyone else +, aoSupport ? !stdenv.isLinux, libao ? null +, jackSupport ? false, libjack ? null +, samplerateSupport ? jackSupport, libsamplerate ? null +, ossSupport ? false, alsaOss ? null +, pulseaudioSupport ? false, libpulseaudio ? null + +# TODO: add these +#, artsSupport +#, roarSupport +#, sndioSupport +#, sunSupport +#, waveoutSupport + +, cddbSupport ? true, libcddb ? null +, cdioSupport ? true, libcdio ? null +, cueSupport ? true, libcue ? null +, discidSupport ? true, libdiscid ? null +, ffmpegSupport ? true, ffmpeg ? null +, flacSupport ? true, flac ? null +, madSupport ? true, libmad ? null +, mikmodSupport ? true, libmikmod ? null +, modplugSupport ? true, libmodplug ? null +, mpcSupport ? true, libmpcdec ? null +, tremorSupport ? false, tremor ? null +, vorbisSupport ? true, libvorbis ? null +, wavpackSupport ? true, wavpack ? null + +# can't make these work, something is broken +#, aacSupport ? true, faac ? null +#, mp4Support ? true, mp4v2 ? null +#, opusSupport ? true, opusfile ? null + +# not in nixpkgs +#, vtxSupport ? true, libayemu ? null +}: + +with stdenv.lib; + +assert samplerateSupport -> jackSupport; + +# vorbis and tremor are mutually exclusive +assert vorbisSupport -> !tremorSupport; +assert tremorSupport -> !vorbisSupport; + +let + + mkFlag = b: f: dep: if b + then { flags = [ f ]; deps = [ dep ]; } + else { flags = []; deps = []; }; + + opts = [ + # Audio output + (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag aoSupport "CONFIG_AO=y" libao) + (mkFlag jackSupport "CONFIG_JACK=y" libjack) + (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) + (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) + + #(mkFlag artsSupport "CONFIG_ARTS=y") + #(mkFlag roarSupport "CONFIG_ROAR=y") + #(mkFlag sndioSupport "CONFIG_SNDIO=y") + #(mkFlag sunSupport "CONFIG_SUN=y") + #(mkFlag waveoutSupport "CONFIG_WAVEOUT=y") + + # Input file formats + (mkFlag cddbSupport "CONFIG_CDDB=y" libcddb) + (mkFlag cdioSupport "CONFIG_CDIO=y" libcdio) + (mkFlag cueSupport "CONFIG_CUE=y" libcue) + (mkFlag discidSupport "CONFIG_DISCID=y" libdiscid) + (mkFlag ffmpegSupport "CONFIG_FFMPEG=y" ffmpeg) + (mkFlag flacSupport "CONFIG_FLAC=y" flac) + (mkFlag madSupport "CONFIG_MAD=y" libmad) + (mkFlag mikmodSupport "CONFIG_MIKMOD=y" libmikmod) + (mkFlag modplugSupport "CONFIG_MODPLUG=y" libmodplug) + (mkFlag mpcSupport "CONFIG_MPC=y" libmpcdec) + (mkFlag tremorSupport "CONFIG_TREMOR=y" tremor) + (mkFlag vorbisSupport "CONFIG_VORBIS=y" libvorbis) + (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack) + + #(mkFlag opusSupport "CONFIG_OPUS=y" opusfile) + #(mkFlag mp4Support "CONFIG_MP4=y" mp4v2) + #(mkFlag aacSupport "CONFIG_AAC=y" faac) + + #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) + ]; + +in stdenv.mkDerivation rec { name = "cmus-${version}"; @@ -11,9 +102,14 @@ stdenv.mkDerivation rec { sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728"; }; - configurePhase = "./configure prefix=$out"; + patches = [ ./option-debugging.patch ]; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; + configurePhase = "./configure " + concatStringsSep " " ([ + "prefix=$out" + "CONFIG_WAV=y" + ] ++ concatMap (a: a.flags) opts); + + buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch new file mode 100644 index 00000000000..84115e1480e --- /dev/null +++ b/pkgs/applications/audio/cmus/option-debugging.patch @@ -0,0 +1,42 @@ +Shows build and link errors in configure for ease of debugging which +options require what. +diff --git a/scripts/checks.sh b/scripts/checks.sh +index 64cbbf3..fab4d9b 100644 +--- a/scripts/checks.sh ++++ b/scripts/checks.sh +@@ -425,7 +425,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" +- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CC -c $CFLAGS "$@" $__src -o $__obj + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -433,7 +433,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" +- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CXX -c $CXXFLAGS "$@" $__src -o $__obj + ;; + esac + return $? +@@ -451,7 +451,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" +- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null ++ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -459,7 +459,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" +- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null ++ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" + ;; + esac + return $? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788f458398f..4b0ed00042e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11234,7 +11234,12 @@ let pulseSupport = config.pulseaudio or true; }; - cmus = callPackage ../applications/audio/cmus { }; + cmus = callPackage ../applications/audio/cmus { + libjack = libjack2; + libcdio = libcdio082; + + pulseaudioSupport = config.pulseaudio or false; + }; CompBus = callPackage ../applications/audio/CompBus { }; From ce013bf507be3fa89aee67fc9b3d6b308bfe4953 Mon Sep 17 00:00:00 2001 From: codsl Date: Sat, 5 Dec 2015 18:56:33 +0000 Subject: [PATCH 021/498] emacs-packages: use-package: 20150317 -> 20151112 --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 90ba8e387f2..77bacf86ad1 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -1886,12 +1886,12 @@ let self = _self // overrides; use-package = melpaBuild rec { pname = "use-package"; - version = "20150317"; + version = "20151112"; src = fetchFromGitHub { owner = "jwiegley"; repo = pname; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; From 4f15547a9c43b7d0909ed78ec57d1845be3ba5bd Mon Sep 17 00:00:00 2001 From: codsl Date: Sat, 5 Dec 2015 18:57:10 +0000 Subject: [PATCH 022/498] emacs-packages: bind-key: 20150317 -> 20150321, fixes #11490 --- pkgs/top-level/emacs-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 77bacf86ad1..d457efce4d4 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -315,12 +315,12 @@ let self = _self // overrides; bind-key = melpaBuild { pname = "bind-key"; - version = "20150317"; + version = "20150321"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; files = [ "bind-key.el" ]; meta = { From c51227897653009074306ac470099d7dd6ed3dd0 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 5 Dec 2015 12:23:03 -0500 Subject: [PATCH 023/498] mention-bot: blacklist civodul, fixes #11488 --- .mention-bot | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .mention-bot diff --git a/.mention-bot b/.mention-bot new file mode 100644 index 00000000000..36e38ed82b9 --- /dev/null +++ b/.mention-bot @@ -0,0 +1,6 @@ +{ + // users in this list will never be mentioned by mention-bot + "userBlacklist": [ + "civodul" + ] +} From 5bd92c0197a8a3508afae8268907a8c5c9c4afc5 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Sun, 8 Nov 2015 09:52:04 +0100 Subject: [PATCH 024/498] ums: init at 5.3.1, fixes #11485 --- lib/maintainers.nix | 1 + pkgs/servers/ums/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/servers/ums/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 84f6b0094c6..cf142c26d5e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -288,6 +288,7 @@ tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; telotortium = "Robert Irelan "; + thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; theuni = "Christian Theune "; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix new file mode 100644 index 00000000000..4151144e3ab --- /dev/null +++ b/pkgs/servers/ums/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, makeWrapper +, libzen, libmediainfo , jre8 +}: + +stdenv.mkDerivation rec { + name = "ums-${version}"; + version = "5.3.1"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; + sha256 = "197lrfqk4n6fffrabj0607a9a5wc1j662s46anc0mkyqbb4r3avh"; + name = "${name}-${version}.tgz"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + cp -a . $out/ + mkdir $out/bin + mv $out/documentation /$out/doc + + makeWrapper "$out/UMS.sh" "$out/bin/ums" \ + --prefix LD_LIBRARY_PATH ":" "${libzen}/lib:${libmediainfo}/lib" \ + --set JAVA_HOME "${jre8}" + ''; + + meta = { + description = "Universal Media Server: a DLNA-compliant UPnP Media Server."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thall ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b0ed00042e..62c59879504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15492,6 +15492,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + ums = callPackage ../servers/ums { }; + urbit = callPackage ../misc/urbit { }; utf8proc = callPackage ../development/libraries/utf8proc { }; From 43a1cfccf55b5e4cb8a38199373087d0f3c22e2e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 4 Dec 2015 16:15:44 +0000 Subject: [PATCH 025/498] conky: build the docs, fixes #11461 --- pkgs/os-specific/linux/conky/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 62c883b6ab8..46b749f55e8 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,12 @@ , ibmSupport ? true # IBM/Lenovo notebooks # optional features with extra dependencies + +# ouch, this is ugly, but this gives the man page +, docsSupport ? true, docbook2x, libxslt ? null + , man ? null, less ? null + , docbook_xsl ? null , docbook_xml_dtd_44 ? null + , ncursesSupport ? true , ncurses ? null , x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null @@ -27,6 +33,10 @@ , libxml2 ? null }: +assert docsSupport -> docbook2x != null && libxslt != null + && man != null && less != null + && docbook_xsl != null && docbook_xml_dtd_44 != null; + assert ncursesSupport -> ncurses != null; assert x11Support -> xlibsWrapper != null; @@ -63,11 +73,20 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake + '' + optionalString docsSupport '' + # Drop examples, since they contain non-ASCII characters that break docbook2x :( + sed -i 's/ Example: .*$//' doc/config_settings.xml + + substituteInPlace cmake/Docbook.cmake \ + --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" + substituteInPlace doc/docs.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" ''; NIX_LDFLAGS = "-lgcc_s"; buildInputs = [ pkgconfig glib cmake ] + ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage @@ -82,6 +101,7 @@ stdenv.mkDerivation rec { ; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional curlSupport "-DBUILD_CURL=ON" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" ++ optional imlib2Support "-DBUILD_IMLIB2=ON" From 1b0edf40c32f833a0ee106d798857b8add65e403 Mon Sep 17 00:00:00 2001 From: Peter Panaguiton Date: Fri, 4 Dec 2015 14:57:16 -0700 Subject: [PATCH 026/498] cwm: init at 5.6, fixes #11458 --- .../window-managers/cwm/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/window-managers/cwm/default.nix diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix new file mode 100644 index 00000000000..b2aa4de40c0 --- /dev/null +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: + +stdenv.mkDerivation rec { + name = "cwm-5.6"; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "cwm"; + rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0"; + sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; + }; + + buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = with stdenv.lib; { + description = "A lightweight and efficient window manager for X11"; + homepage = https://github.com/chneukirchen/cwm; + maintainers = []; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62c59879504..1e0a94fbd60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11290,6 +11290,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cwm = callPackage ../applications/window-managers/cwm { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; d4x = callPackage ../applications/misc/d4x { }; From 59823208a6a4373d20e6d5ba7abbf4228c9638a6 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Thu, 3 Dec 2015 14:33:09 +0100 Subject: [PATCH 027/498] python modestmaps: init at 1.4.6, fixes #11429 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e994c070e56..c12af9efa31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9834,6 +9834,24 @@ in modules // { }; }); + modestmaps = buildPythonPackage rec { + name = "ModestMaps-1.4.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/M/ModestMaps/${name}.tar.gz"; + sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3"; + }; + + disabled = !isPy27; + propagatedBuildInputs = with self; [ pillow ]; + + meta = { + description = "A library for building interactive maps"; + homepage = http://modestmaps.com; + license = stdenv.lib.licenses.bsd3; + }; + }; + moinmoin = buildPythonPackage (rec { name = "moinmoin-${ver}"; disabled = isPy3k; From 84bc6d64ba4290649102683604d0a5d18894646a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Dec 2015 11:05:48 +0100 Subject: [PATCH 028/498] gstreamer: 1.4.x -> 1.6.x (all modules) (And while at it, gst-vaapi 0.6.0 -> 0.6.1.) * gst-editing-services grew additional build time dependencies, flex and perl. * gst-libav switched from libav to ffmpeg as "libav" provider, see http://gstreamer.freedesktop.org/releases/1.6/. Without using ffmpeg, one may hit issues such as this (which I initially did): (gst-plugin-scanner:19751): GStreamer-WARNING **: Failed to load plugin '/nix/store/0wgpq2yx9wrkp2mh4rn1c7zbiq2bqa2l-gst-libav-1.6.1/lib/gstreamer-1.0/libgstlibav.so': /nix/store/0wgpq2yx9wrkp2mh4rn1c7zbiq2bqa2l-gst-libav-1.6.1/lib/gstreamer-1.0/libgstlibav.so: undefined symbol: av_frame_get_sample_rate --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/default.nix | 2 ++ pkgs/development/libraries/gstreamer/ges/default.nix | 8 ++++---- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/libav/default.nix | 7 +++++-- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b4c962d9e54..dd9ddc7ec9b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.5"; + name = "gst-plugins-bad-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm"; + sha256 = "0rjla9zcal9b5ynagq7cscjs53qrd9bafjkjssrp8s2z2apsjxp1"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index f959da4045e..9192feb1c0c 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.4.5"; + name = "gst-plugins-base-1.6.1"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"; + sha256 = "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5dbcb1cee4b..98cfa98bfe1 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.5"; + name = "gstreamer-1.6.1"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"; + sha256 = "172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 7d349f31e04..2d5b493e731 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -15,6 +15,8 @@ rec { gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle + # (Non Linear Engine). gst-editing-services = callPackage ./ges { inherit gnonlin; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 47b09e95e6e..96dc42c3cb1 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, python, gobjectIntrospection -, gnonlin, libxml2 +, gnonlin, libxml2, flex, perl }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.4.0"; + name = "gstreamer-editing-services-1.6.1"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "1cwbh244an6zsxsscvg6xjnb34ylci34g9zx59xjbv5wnw7vj86c"; + sha256 = "1lkvkrsipn35341hwwkhwn44n90y49sjwra1r5pazbjgn1yykxzm"; }; - nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; propagatedBuildInputs = [ gnonlin libxml2 ]; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c999c65229e..8afbfd4ff54 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.4.5"; + name = "gst-plugins-good-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"; + sha256 = "0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index bcc05e44103..aeefd667b34 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -3,10 +3,13 @@ , withSystemLibav ? true, libav ? null }: +# Note that since gst-libav-1.6, libav is actually ffmpeg. See +# http://gstreamer.freedesktop.org/releases/1.6/ for more info. + assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.4.5"; + name = "gst-libav-1.6.1"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"; + sha256 = "1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index c13beb4d5f7..b014446c7c4 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.4.5"; + name = "gst-plugins-ugly-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"; + sha256 = "0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 349b5093a3b..015aa4e07f5 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; - sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n"; + sha256 = "1cv7zlz5wj6b3acv0pr5cq5wqzd5vcs1lrrlvyl9wrzcnzz8mz1n"; }; nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9e07a590ab..7b9e340b077 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6518,7 +6518,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; }); + callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); gst_all = { From b2cad165bb4f2f230f326f0582d962b05a40cd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Dec 2015 11:58:06 +0100 Subject: [PATCH 029/498] gst-validate: init at 1.6.0 pitivi-0.95 requires this. (I added iyzsong as maintainer, in line with the other gstreamer packages.) --- .../libraries/gstreamer/default.nix | 2 ++ .../libraries/gstreamer/validate/default.nix | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/gstreamer/validate/default.nix diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 2d5b493e731..efdaa37eba5 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -20,4 +20,6 @@ rec { gst-editing-services = callPackage ./ges { inherit gnonlin; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; }; + + gst-validate = callPackage ./validate { inherit gst-plugins-base; }; } diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix new file mode 100644 index 00000000000..c88cf489732 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base +, python, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "gst-validate-1.6.0"; + + meta = { + description = "Integration testing infrastructure for the GStreamer framework"; + homepage = "http://gstreamer.freedesktop.org"; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; + sha256 = "1vmg5mh068zrvhgrjsbnb7y4k632akyhm8ql0g196cinnp3zibiv"; + }; + + nativeBuildInputs = [ + pkgconfig gobjectIntrospection + ]; + + buildInputs = [ + python + ]; + + propagatedBuildInputs = [ gstreamer gst-plugins-base ]; + + enableParallelBuilding = true; +} + From aad87c4cd0be1bd21038868ddeb6911a3cf2cef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Dec 2015 12:53:29 +0100 Subject: [PATCH 030/498] pygobject3: 3.12.1 -> 3.18.2 pitivi-0.95 needs pygobject >= 3.14. --- pkgs/development/python-modules/pygobject/3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 14b7bd34eae..b8082890299 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: stdenv.mkDerivation rec { - name = "pygobject-3.12.1"; + name = "pygobject-3.18.2"; src = fetchurl { - url = "mirror://gnome/sources/pygobject/3.12/${name}.tar.xz"; - sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys"; + url = "mirror://gnome/sources/pygobject/3.18/${name}.tar.xz"; + sha256 = "0prc3ky7g50ixmfxbc7zf43fw6in4hw2q07667hp8swi2wassg1a"; }; buildInputs = [ python pkgconfig glib gobjectIntrospection ]; From a356c3fa47b31e570408dd7395bc5c0a3f464abd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Dec 2015 23:33:06 +0000 Subject: [PATCH 031/498] kotlin: init at 1.0.0-beta-3594 --- lib/maintainers.nix | 1 + pkgs/development/compilers/kotlin/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 42 insertions(+) create mode 100644 pkgs/development/compilers/kotlin/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 54e10e5cf8c..291f861b010 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -207,6 +207,7 @@ muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; + nequissimus = "Tim Steinbach "; nico202 = "Nicolò Balzarotti "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix new file mode 100644 index 00000000000..8c21fb9e263 --- /dev/null +++ b/pkgs/development/compilers/kotlin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, jre, unzip, which }: + +stdenv.mkDerivation rec { + version = "1.0.0-beta-3594"; + name = "kotlin-${version}"; + + src = fetchurl { + url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip"; + sha256 = "a633dc27bc9bc87174835ea47d5be8ec73e0a673bb46c4b9a5a784db95f3c733"; + }; + + propagatedBuildInputs = [ jre which ] ; + buildInputs = [ makeWrapper unzip ] ; + + installPhase = '' + mkdir -p $out + rm "bin/"*.bat + mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done + ''; + + meta = { + description = "General purpose programming language"; + longDescription = '' + Kotlin is a statically typed language that targets the JVM and JavaScript. + It is a general-purpose language intended for industry use. + It is developed by a team at JetBrains although it is an OSS language + and has external contributors. + ''; + homepage = http://kotlinlang.org/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; + [ nequissimus ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffeb3dd4dc0..a45eba8246a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4222,6 +4222,8 @@ let openblas = openblasCompat; }; + kotlin = callPackage ../development/compilers/kotlin { }; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; From 2b6dcdfcd094bf8d6046a17a4d560cf110a6316e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 5 Dec 2015 22:41:25 +0100 Subject: [PATCH 032/498] Rename 'emery' maintainer handle to 'ehmry', fixes #11493 Communication happens on Github so names should be consistent. --- lib/maintainers.nix | 2 +- nixos/tests/cjdns.nix | 4 ++-- pkgs/applications/audio/gnaural/default.nix | 2 +- pkgs/applications/audio/meters_lv2/default.nix | 2 +- pkgs/applications/audio/picard/default.nix | 2 +- pkgs/applications/editors/rstudio/default.nix | 2 +- pkgs/applications/misc/electrum/default.nix | 2 +- pkgs/applications/misc/monero/default.nix | 2 +- pkgs/applications/misc/qtbitcointrader/default.nix | 2 +- pkgs/applications/misc/xcruiser/default.nix | 2 +- .../networking/browsers/mozilla-plugins/trezor/default.nix | 2 +- .../networking/instant-messengers/ratox/default.nix | 2 +- pkgs/applications/networking/newsreaders/slrn/default.nix | 2 +- pkgs/applications/networking/p2p/firestr/default.nix | 2 +- pkgs/applications/networking/p2p/ncdc/default.nix | 2 +- .../networking/p2p/transmission-remote-gtk/default.nix | 2 +- pkgs/applications/networking/sync/rsync/default.nix | 2 +- pkgs/development/compilers/nim/default.nix | 2 +- pkgs/development/go-modules/generic/default.nix | 2 +- pkgs/development/libraries/assimp/default.nix | 2 +- pkgs/development/libraries/chromaprint/default.nix | 2 +- pkgs/development/libraries/libdiscid/default.nix | 2 +- pkgs/development/libraries/libogg/default.nix | 2 +- pkgs/development/libraries/libvorbis/default.nix | 2 +- pkgs/games/gnubg/default.nix | 2 +- pkgs/servers/mpd/clientlib.nix | 2 +- pkgs/servers/mpd/default.nix | 2 +- pkgs/servers/polipo/default.nix | 2 +- pkgs/servers/rippled/default.nix | 2 +- pkgs/servers/u9fs/default.nix | 2 +- pkgs/servers/uhub/default.nix | 2 +- pkgs/tools/archivers/unrar/default.nix | 2 +- pkgs/tools/audio/dir2opus/default.nix | 2 +- pkgs/tools/audio/liquidsoap/full.nix | 2 +- pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +- pkgs/tools/misc/cpuminer-multi/default.nix | 2 +- pkgs/tools/misc/ipxe/default.nix | 2 +- pkgs/tools/misc/makebootfat/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/unbound/default.nix | 2 +- pkgs/tools/security/mbox/default.nix | 2 +- pkgs/tools/text/mawk/default.nix | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 282c7112b2f..e6947bf804c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -92,7 +92,7 @@ eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; ellis = "Ellis Whitehead "; - emery = "Emery Hemingway "; + ehmry = "Emery Hemingway "; enolan = "Echo Nolan "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 2cae63fdda4..f61c82b916a 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "cjdns"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ emery ]; + maintainers = [ ehmry ]; }; nodes = rec @@ -122,4 +122,4 @@ import ./make-test.nix ({ pkgs, ...} : { $bob->succeed("curl --fail -g http://[$aliceIp6]"); ''; -}) \ No newline at end of file +}) diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 93abad7aa77..2b78d1a4b6d 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { { description = "Auditory binaural-beat generator"; homepage = http://gnaural.sourceforge.net/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 3b7a5bc685c..e412f31f316 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; homepage = http://x42.github.io/meters.lv2/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 3d0114352a1..df76b8073b6 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { meta = with stdenv.lib; { homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; description = "The official MusicBrainz tagger"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 8f0c560f47d..0749f58ecea 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { { description = "Set of integrated tools for the R language"; homepage = http://www.rstudio.com/; license = licenses.agpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 1b2e518c5a7..df997ad6e0b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { ''; homepage = https://electrum.org; license = licenses.gpl3; - maintainers = with maintainers; [ emery joachifm ]; + maintainers = with maintainers; [ ehmry joachifm ]; }; } diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 6af9b7dc267..e7829be0364 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Private, secure, untraceable currency"; homepage = http://monero.cc/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 06a7e3bcd7e..8b527463b22 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = https://centrabit.com/; license = licenses.lgpl3; platforms = qt.meta.platforms; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index f580c41c0a4..9a912353281 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { ''; homepage = http://xcruiser.sourceforge.net/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index 10b2ffaff5b..ad3c1a715b3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { description = "Plugin for browser to TREZOR device communication"; homepage = https://mytrezor.com; license = licenses.unfree; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 4635814e11c..9f107559551 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "FIFO based tox client"; homepage = http://ratox.2f30.org/; license = licenses.isc; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 84cf023776e..6aa1ec76253 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index e7be81def61..6b1a1fc9454 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Grass computing platform"; homepage = http://firestr.com/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 5f7ad92f7cc..b1181960f41 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 5d76b295dda..dc80d7d34de 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { { description = "GTK remote control for the Transmission BitTorrent client"; homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5e29e3cfd0d..5e09beb4c47 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A fast incremental file transfer utility"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ simons emery ]; + maintainers = with maintainers; [ simons ehmry ]; }; } diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 142167e3373..6e552959fdb 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "Statically typed, imperative programming language"; homepage = http://nim-lang.org/; license = licenses.mit; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux ++ platforms.darwin; # arbitrary }; } diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 4412b3d535c..bd2289723f8 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -168,6 +168,6 @@ go.stdenv.mkDerivation ( } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.emery lib.maintainers.lethalman ]; + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; }; }) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 70447d9f885..cfe86ce4e70 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "A library to import various 3D model formats"; homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platfroms = platforms.linux; inherit version; }; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 5bf1ec78bef..c06b9355d30 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 8c5c8bef351..09427e2788a 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 4e017840472..407e218065b 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index d58607ea298..68f1fe72085 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 83560c21f5d..80cc7763266 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { { description = "World class backgammon application"; homepage = http://www.gnubg.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 41e3b547f70..82d18091050 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall emery ]; + maintainers = with maintainers; [ mornfall ehmry ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 6c630d9237c..b672083340e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu emery ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 08ccbbd06c6..1ca18d7d3a7 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; description = "A small and fast caching web proxy"; license = licenses.mit; - maintainers = with maintainers; [ phreedom emery ]; + maintainers = with maintainers; [ phreedom ehmry ]; platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 808f181442a..7f9f08af002 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = https://ripple.com; - maintainers = with maintainers; [ emery offline ]; + maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index e60a74eaf89..b42fe004af3 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { { description = "Serve 9P from Unix"; homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs; license = licenses.free; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index a6e0d474d89..0d276c18f2d 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "High performance peer-to-peer hub for the ADC network"; homepage = https://www.uhub.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } \ No newline at end of file diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index eb0d3a3bd83..404927e0939 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index bc3eaf9bf53..4875ebf504b 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ehmry/dir2opus; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; }; } \ No newline at end of file diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 859fe4bb183..eeebea5d747 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; homepage = http://liquidsoap.fm/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f8fa5cc264d..073dc585e74 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ emery jagajaga ]; + maintainers = with maintainers; [ ehmry jagajaga ]; }; } diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 22006310780..4b4eb87b0ea 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Multi-algo CPUMiner"; homepage = https://github.com/wolf9466/cpuminer-multi; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index ec9458e70ae..e4c161b2e51 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { { description = "Network boot firmware"; homepage = http://ipxe.org/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index 03c913b7224..dc66976720d 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 86c3ea4f919..906ca5f39dd 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric emery ]; + maintainers = with maintainers; [ viric ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index e356d6d6537..b15473ddf4c 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Validating, recursive, and caching DNS resolver"; license = stdenv.lib.licenses.bsd3; homepage = http://www.unbound.net; - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 732cf704661..24a7ea51a82 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; homepage = http://pdos.csail.mit.edu/mbox/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 3337fa62a28..67d2df10363 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { { description = "Interpreter for the AWK Programming Language"; homepage = http://invisible-island.net/mawk/mawk.html; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file From 9d1bbf7a020f46e8944b699b0897c16433819a36 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 5 Dec 2015 23:08:22 +0100 Subject: [PATCH 033/498] neovim: update 0.1.0 -> 0.1.1 --- pkgs/applications/editors/neovim/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 344293d3367..a27027406e2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -15,15 +15,15 @@ with stdenv.lib; let - version = "0.1.0"; + version = "0.1.1"; # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation { + neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation { name = "neovim-libvterm-${version}"; src = fetchFromGitHub { - sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5"; - rev = "20ad1396c178c72873aeeb2870bd726f847acb70"; + sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; + rev = "04781d37ce5af3f580376dc721bd3b89c434966b"; repo = "libvterm"; owner = "neovim"; }; @@ -63,7 +63,7 @@ let name = "neovim-${version}"; src = fetchFromGitHub { - sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx"; + sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; rev = "v${version}"; repo = "neovim"; owner = "neovim"; From 51bcfbe007ca77e36a7ec63297a9072164ce55c6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 5 Dec 2015 08:34:50 +0100 Subject: [PATCH 034/498] pythonPackages.acme: extract from letsencrypt derivation. --- pkgs/tools/admin/letsencrypt/default.nix | 22 ++++------------------ pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 5481ad3aaf7..2c74a677b91 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,27 +1,13 @@ { stdenv, pythonPackages, fetchurl, dialog }: -let +pythonPackages.buildPythonPackage rec { + version = "0.1.0"; + name = "letsencrypt-${version}"; + src = fetchurl { url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz"; sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw"; }; - version = "0.1.0"; - acme = pythonPackages.buildPythonPackage rec { - name = "acme-${version}"; - inherit src version; - - propagatedBuildInputs = with pythonPackages; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with pythonPackages; [ nose ]; - - sourceRoot = "letsencrypt-${version}/acme"; - }; -in pythonPackages.buildPythonPackage rec { - name = "letsencrypt-${version}"; - inherit src version; propagatedBuildInputs = with pythonPackages; [ zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c12af9efa31..c62715593c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,21 @@ in modules // { }; }; + acme = buildPythonPackage rec { + inherit (pkgs.letsencrypt) src version; + + name = "acme-${version}"; + + propagatedBuildInputs = with self; [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = with self; [ nose ]; + + sourceRoot = "letsencrypt-${version}/acme"; + }; + actdiag = buildPythonPackage rec { name = "actdiag-0.5.3"; From 7cc6e6718ced96f59e0389b987da860b37fb5c56 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 5 Dec 2015 08:43:56 +0100 Subject: [PATCH 035/498] simp_le: init at 20151205, fixes #11479 --- pkgs/tools/admin/simp_le/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/simp_le/default.nix diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix new file mode 100644 index 00000000000..5f945309aac --- /dev/null +++ b/pkgs/tools/admin/simp_le/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "simp_le-20151205"; + + src = fetchFromGitHub { + owner = "kuba"; + repo = "simp_le"; + rev = "976a33830759e66610970f92f6ec1a656a2c8335"; + sha256 = "0bfa5081rmjjg9sii6pn2dskd1wh0dgrf9ic9hpisawrk0y0739i"; + }; + + propagatedBuildInputs = with pythonPackages; [ acme cryptography pytz requests2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kuba/simp_le; + description = "Simple Let's Encrypt client"; + license = licenses.gpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81e7006419d..da628ae97ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8352,6 +8352,8 @@ let simgear = callPackage ../development/libraries/simgear { }; + simp_le = callPackage ../tools/admin/simp_le { }; + sfml = callPackage ../development/libraries/sfml { }; signon = callPackage ../development/libraries/signon/old.nix {}; From 0113161c55bda01340b14d5eb6ef5e946fd210f3 Mon Sep 17 00:00:00 2001 From: "Mayeu (Cast)" Date: Thu, 3 Dec 2015 14:40:16 +0100 Subject: [PATCH 036/498] Owncloud 8.2.0 -> 8.2.1 Multiple bug fixes and performance improvement. Hash directly taken from the Owncloud changelog. --- pkgs/servers/owncloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 4122e940c76..5095b95285c 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -52,8 +52,8 @@ in { }; owncloud82 = common { - versiona = "8.2.0"; - sha256 = "fcfe99cf1c3aa06ff369e5b1a602147c08dd977af11800fe06c6a661fa5f770c"; + versiona = "8.2.1"; + sha256 = "5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4"; }; } From 808ae1fd6999bb692115a126d6d46ef91961e252 Mon Sep 17 00:00:00 2001 From: "Mayeu (Cast)" Date: Thu, 3 Dec 2015 16:15:39 +0100 Subject: [PATCH 037/498] Owncloud: 7.0.10 -> 7.0.11, fixes #11428 --- pkgs/servers/owncloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 5095b95285c..0351df9718b 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -37,8 +37,8 @@ in { }; owncloud70 = common { - versiona = "7.0.10"; - sha256 = "7e77f27137f37a721a8827b0436a9e71c100406d9745c4251c37c14bcaf31d0b"; + versiona = "7.0.11"; + sha256 = "21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2"; }; owncloud80 = common { From 9c24bdff4210f67fc3d47d1f46d9ed37e973d1a6 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 30 Nov 2015 20:39:26 +0100 Subject: [PATCH 038/498] backup: init v4, fixes #11370 --- pkgs/tools/backup/backup/Gemfile | 23 + pkgs/tools/backup/backup/Gemfile.lock | 276 +++++++++ pkgs/tools/backup/backup/default.nix | 20 + pkgs/tools/backup/backup/gemset.nix | 778 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 1099 insertions(+) create mode 100644 pkgs/tools/backup/backup/Gemfile create mode 100644 pkgs/tools/backup/backup/Gemfile.lock create mode 100644 pkgs/tools/backup/backup/default.nix create mode 100644 pkgs/tools/backup/backup/gemset.nix diff --git a/pkgs/tools/backup/backup/Gemfile b/pkgs/tools/backup/backup/Gemfile new file mode 100644 index 00000000000..2f1825b590e --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile @@ -0,0 +1,23 @@ +source "https://rubygems.org" + +gem 'backup' +gem 'thor' +gem 'open4' +gem 'fog' +gem 'unf' +gem 'dropbox-sdk', '= 1.5.1' # patched +gem 'net-ssh' +gem 'net-scp' +gem 'net-sftp' +gem 'mail', '= 2.5.4' # patched +gem 'pagerduty' +gem 'twitter' +gem 'hipchat' +gem 'flowdock' +gem 'json' +gem 'dogapi' +gem 'aws-ses' +gem 'rspec' +gem 'fuubar' +gem 'mocha' +gem 'timecop' diff --git a/pkgs/tools/backup/backup/Gemfile.lock b/pkgs/tools/backup/backup/Gemfile.lock new file mode 100644 index 00000000000..0725ded8add --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile.lock @@ -0,0 +1,276 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.1) + addressable (2.3.5) + atomic (1.1.14) + aws-ses (0.5.0) + builder + mail (> 2.2.5) + mime-types + xml-simple + backup (4.2.2) + CFPropertyList (= 2.3.1) + addressable (= 2.3.5) + atomic (= 1.1.14) + aws-ses (= 0.5.0) + buftok (= 0.2.0) + builder (= 3.2.2) + descendants_tracker (= 0.0.3) + dogapi (= 1.11.0) + dropbox-sdk (= 1.5.1) + equalizer (= 0.0.9) + excon (= 0.44.4) + faraday (= 0.8.8) + fission (= 0.5.0) + flowdock (= 0.4.0) + fog (= 1.28.0) + fog-atmos (= 0.1.0) + fog-aws (= 0.1.1) + fog-brightbox (= 0.7.1) + fog-core (= 1.29.0) + fog-ecloud (= 0.0.2) + fog-json (= 1.0.0) + fog-profitbricks (= 0.0.2) + fog-radosgw (= 0.0.3) + fog-riakcs (= 0.1.0) + fog-sakuracloud (= 1.0.0) + fog-serverlove (= 0.1.1) + fog-softlayer (= 0.4.1) + fog-storm_on_demand (= 0.1.0) + fog-terremark (= 0.0.4) + fog-vmfusion (= 0.0.1) + fog-voxel (= 0.0.2) + fog-xml (= 0.1.1) + formatador (= 0.2.5) + hipchat (= 1.0.1) + http (= 0.5.0) + http_parser.rb (= 0.6.0) + httparty (= 0.12.0) + inflecto (= 0.0.2) + ipaddress (= 0.8.0) + json (= 1.8.2) + mail (= 2.5.4) + memoizable (= 0.4.0) + mime-types (= 1.25.1) + mini_portile (= 0.6.2) + multi_json (= 1.10.1) + multi_xml (= 0.5.5) + multipart-post (= 1.2.0) + net-scp (= 1.2.1) + net-sftp (= 2.1.2) + net-ssh (= 2.9.2) + nokogiri (= 1.6.6.2) + open4 (= 1.3.0) + pagerduty (= 2.0.0) + polyglot (= 0.3.3) + simple_oauth (= 0.2.0) + thor (= 0.18.1) + thread_safe (= 0.1.3) + treetop (= 1.4.15) + twitter (= 5.5.0) + unf (= 0.1.3) + unf_ext (= 0.0.6) + xml-simple (= 1.1.4) + buftok (0.2.0) + builder (3.2.2) + descendants_tracker (0.0.3) + diff-lcs (1.2.5) + dogapi (1.11.0) + json (>= 1.5.1) + dropbox-sdk (1.5.1) + json + equalizer (0.0.9) + excon (0.44.4) + faraday (0.8.8) + multipart-post (~> 1.2.0) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.4.0) + httparty (~> 0.7) + multi_json + fog (1.28.0) + fog-atmos + fog-aws (~> 0.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.27, >= 1.27.3) + fog-ecloud + fog-json + fog-profitbricks + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + nokogiri (~> 1.5, >= 1.5.11) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.7.1) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-core (1.29.0) + builder + excon (~> 0.38) + formatador (~> 0.2) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-ecloud (0.0.2) + fog-core + fog-xml + fog-json (1.0.0) + multi_json (~> 1.0) + fog-profitbricks (0.0.2) + fog-core + fog-xml + nokogiri + fog-radosgw (0.0.3) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.0.0) + fog-core + fog-json + fog-serverlove (0.1.1) + fog-core + fog-json + fog-softlayer (0.4.1) + fog-core + fog-json + fog-storm_on_demand (0.1.0) + fog-core + fog-json + fog-terremark (0.0.4) + fog-core + fog-xml + fog-vmfusion (0.0.1) + fission + fog-core + fog-voxel (0.0.2) + fog-core + fog-xml + fog-xml (0.1.1) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + hipchat (1.0.1) + httparty + http (0.5.0) + http_parser.rb + http_parser.rb (0.6.0) + httparty (0.12.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + inflecto (0.0.2) + ipaddress (0.8.0) + json (1.8.2) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + memoizable (0.4.0) + thread_safe (~> 0.1.3) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.2) + mocha (1.1.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + open4 (1.3.0) + pagerduty (2.0.0) + json (>= 1.7.7) + polyglot (0.3.3) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby-progressbar (1.7.5) + simple_oauth (0.2.0) + thor (0.18.1) + thread_safe (0.1.3) + atomic + timecop (0.8.0) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + twitter (5.5.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + descendants_tracker (~> 0.0.3) + equalizer (~> 0.0.9) + faraday (>= 0.8, < 0.10) + http (~> 0.5.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + simple_oauth (~> 0.2.0) + unf (0.1.3) + unf_ext + unf_ext (0.0.6) + xml-simple (1.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + aws-ses + backup + dogapi + dropbox-sdk (= 1.5.1) + flowdock + fog + fuubar + hipchat + json + mail (= 2.5.4) + mocha + net-scp + net-sftp + net-ssh + open4 + pagerduty + rspec + thor + timecop + twitter + unf + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix new file mode 100644 index 00000000000..1890e8121c1 --- /dev/null +++ b/pkgs/tools/backup/backup/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "backup_v4"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Easy full stack backup operations on UNIX-like systems"; + homepage = http://backup.github.io/backup/v4/; + license = licenses.mit; + maintainers = [ maintainers.palo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/backup/backup/gemset.nix b/pkgs/tools/backup/backup/gemset.nix new file mode 100644 index 00000000000..e2de995996e --- /dev/null +++ b/pkgs/tools/backup/backup/gemset.nix @@ -0,0 +1,778 @@ +{ + "CFPropertyList" = { + version = "2.3.1"; + source = { + type = "gem"; + sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k"; + }; + }; + "addressable" = { + version = "2.3.5"; + source = { + type = "gem"; + sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7"; + }; + }; + "atomic" = { + version = "1.1.14"; + source = { + type = "gem"; + sha256 = "09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4"; + }; + }; + "aws-ses" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1kpfcdnakngypgkzn1f8cl8p4jg1rvmx3ag4ggcl0c7gs91ki8k3"; + }; + dependencies = [ + "builder" + "mail" + "mime-types" + "xml-simple" + ]; + }; + "backup" = { + version = "4.2.2"; + source = { + type = "gem"; + sha256 = "0fj5jq6s1kpgp4bl1sr7qw1dgyc9zk0afh6mrfgbscg82irfxi1p"; + }; + dependencies = [ + "CFPropertyList" + "addressable" + "atomic" + "aws-ses" + "buftok" + "builder" + "descendants_tracker" + "dogapi" + "dropbox-sdk" + "equalizer" + "excon" + "faraday" + "fission" + "flowdock" + "fog" + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "formatador" + "hipchat" + "http" + "http_parser.rb" + "httparty" + "inflecto" + "ipaddress" + "json" + "mail" + "memoizable" + "mime-types" + "mini_portile" + "multi_json" + "multi_xml" + "multipart-post" + "net-scp" + "net-sftp" + "net-ssh" + "nokogiri" + "open4" + "pagerduty" + "polyglot" + "simple_oauth" + "thor" + "thread_safe" + "treetop" + "twitter" + "unf" + "unf_ext" + "xml-simple" + ]; + }; + "buftok" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + }; + }; + "builder" = { + version = "3.2.2"; + source = { + type = "gem"; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + }; + }; + "descendants_tracker" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1"; + }; + }; + "diff-lcs" = { + version = "1.2.5"; + source = { + type = "gem"; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + "dogapi" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "01v5jphxbqdn8h0pifgl97igcincd1pjwd177a80ig9fpwndd19d"; + }; + dependencies = [ + "json" + ]; + }; + "dropbox-sdk" = { + version = "1.5.1"; + source = { + type = "gem"; + sha256 = "1zrzxzjfgwkdnn5vjvkhhjh10azyy28982hpkw5xv0kwrqg07axj"; + }; + dependencies = [ + "json" + ]; + }; + "equalizer" = { + version = "0.0.9"; + source = { + type = "gem"; + sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; + }; + }; + "excon" = { + version = "0.44.4"; + source = { + type = "gem"; + sha256 = "062ynrdazix4w1lz6n8qgm3dasi2837sfn88ma96pbp4sk11gbp5"; + }; + }; + "faraday" = { + version = "0.8.8"; + source = { + type = "gem"; + sha256 = "1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fission" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; + }; + dependencies = [ + "CFPropertyList" + ]; + }; + "flowdock" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "1myza5n6wqk550ky3ld4np89cd491prndqy0l1fqsddxpap6pp60"; + }; + dependencies = [ + "httparty" + "multi_json" + ]; + }; + "fog" = { + version = "1.28.0"; + source = { + type = "gem"; + sha256 = "12b03r77vdicbsc7j6by2gysm16wij32z65qp6bkrxkfba9yb37h"; + }; + dependencies = [ + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "ipaddress" + "nokogiri" + ]; + }; + "fog-atmos" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-aws" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "17a3sspf81bgvkrrrmwx7aci7fjy1m7b3w61ljc2mpqbafz80v7i"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + "ipaddress" + ]; + }; + "fog-brightbox" = { + version = "0.7.1"; + source = { + type = "gem"; + sha256 = "1cpa92q2ls51gidxzn407x53f010k0hmrl94ipw7rdzdapp8c4cn"; + }; + dependencies = [ + "fog-core" + "fog-json" + "inflecto" + ]; + }; + "fog-core" = { + version = "1.29.0"; + source = { + type = "gem"; + sha256 = "0ayv9j3i7jy2d1l4gw6sfchgb8l62590a6fpvpr7qvdjc79mvm3p"; + }; + dependencies = [ + "builder" + "excon" + "formatador" + "mime-types" + "net-scp" + "net-ssh" + ]; + }; + "fog-ecloud" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0lhxjp6gi48zanqmkblyhxjp0lknl1akifgfk5lq3j3vj2d3pnr8"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-json" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw"; + }; + dependencies = [ + "multi_json" + ]; + }; + "fog-profitbricks" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0hk290cw99qx727sxfhxlmczv9kv15hlnrflh00wfprqxk4r8rd4"; + }; + dependencies = [ + "fog-core" + "fog-xml" + "nokogiri" + ]; + }; + "fog-radosgw" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "1fbpi0sfff5f5hrn4f7ish260cykzcqvzwmvm61i6mprfrfnx10r"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-riakcs" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-sakuracloud" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1805m44x2pclhjyvdrpj6zg8l9dldgnc20h0g61r7hqxpydz066x"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-serverlove" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "094plkkr6xiss8k85fp66g7z544kxgfx1ck0f3sqndk27miw26jk"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-softlayer" = { + version = "0.4.1"; + source = { + type = "gem"; + sha256 = "1cf6y6xxjjpjglz31kf6jmmyh687x7sxhn4bx3hlr1nb1hcy19sq"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-storm_on_demand" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "0rrfv37x9y07lvdd03pbappb8ybvqb6g8rxzwvgy3mmbmbc6l6d2"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-terremark" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0bxznlc904zaw3qaxhkvhqqbrv9n6nf5idih8ra9dihvacifwhvc"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-vmfusion" = { + version = "0.0.1"; + source = { + type = "gem"; + sha256 = "0x1vxc4a627g7ambcprhxiqvywy64li90145r96b2ig9z23hmy7g"; + }; + dependencies = [ + "fission" + "fog-core" + ]; + }; + "fog-voxel" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0by7cs0c044b8dkcmcf3pjzydnrakj8pnbcxzhw8hwlgqr0jfqgn"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-xml" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "0kgxjwz0mzyp7bgj1ycl9jyfmzfqc1fjdz9sm57fgj5w31jfvxw5"; + }; + dependencies = [ + "fog-core" + "nokogiri" + ]; + }; + "formatador" = { + version = "0.2.5"; + source = { + type = "gem"; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + }; + }; + "fuubar" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv"; + }; + dependencies = [ + "rspec" + "ruby-progressbar" + ]; + }; + "hipchat" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "1khcb6cxrr1qn104rl87wq85anigykf45x7knxnyqfpwnbda2nh1"; + }; + dependencies = [ + "httparty" + ]; + }; + "http" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1vw10xxs0i7kn90lx3b2clfkm43nb59jjph902bafpsaarqsai8d"; + }; + dependencies = [ + "http_parser.rb" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "httparty" = { + version = "0.12.0"; + source = { + type = "gem"; + sha256 = "10y3znh7s1fx88lbnbsmyx5zri6jr1gi48zzzq89wir8q9zlp28c"; + }; + dependencies = [ + "json" + "multi_xml" + ]; + }; + "inflecto" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; + }; + }; + "ipaddress" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "mail" = { + version = "2.5.4"; + source = { + type = "gem"; + sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4"; + }; + dependencies = [ + "mime-types" + "treetop" + ]; + }; + "memoizable" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "0xhg8c9qw4y35qp1k8kv20snnxk6rlyilx354n1d72r0y10s7qcr"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "metaclass" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + }; + }; + "mime-types" = { + version = "1.25.1"; + source = { + type = "gem"; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + "mini_portile" = { + version = "0.6.2"; + source = { + type = "gem"; + sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; + }; + }; + "mocha" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi"; + }; + dependencies = [ + "metaclass" + ]; + }; + "multi_json" = { + version = "1.10.1"; + source = { + type = "gem"; + sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; + }; + }; + "multi_xml" = { + version = "0.5.5"; + source = { + type = "gem"; + sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8"; + }; + }; + "multipart-post" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; + }; + }; + "net-scp" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-sftp" = { + version = "2.1.2"; + source = { + type = "gem"; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-ssh" = { + version = "2.9.2"; + source = { + type = "gem"; + sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + }; + }; + "nokogiri" = { + version = "1.6.6.2"; + source = { + type = "gem"; + sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"; + }; + dependencies = [ + "mini_portile" + ]; + }; + "open4" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "12jyp97p7pq29q1zmkdrhzvg5cg2x3hlfdbq6asnb9nqlkx6vhf2"; + }; + }; + "pagerduty" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "1ads8bj2swm3gbhr6193ls83pnwsy39xyh3i8sw6rl8fxfdf717v"; + }; + dependencies = [ + "json" + ]; + }; + "polyglot" = { + version = "0.3.3"; + source = { + type = "gem"; + sha256 = "082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v"; + }; + }; + "rspec" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + }; + "rspec-core" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + }; + dependencies = [ + "rspec-support" + ]; + }; + "rspec-expectations" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-mocks" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-support" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; + }; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; + "simple_oauth" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1vsjhxybif9r53jx4dhhwf80qjkg7gbwpfmskjqns223qrhwsxig"; + }; + }; + "thor" = { + version = "0.18.1"; + source = { + type = "gem"; + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; + }; + }; + "thread_safe" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq"; + }; + dependencies = [ + "atomic" + ]; + }; + "timecop" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0zf46hkd36y2ywysjfgkvpcc5v04s2rwlg2k7k8j23bh7k8sgiqs"; + }; + }; + "treetop" = { + version = "1.4.15"; + source = { + type = "gem"; + sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz"; + }; + dependencies = [ + "polyglot" + "polyglot" + ]; + }; + "twitter" = { + version = "5.5.0"; + source = { + type = "gem"; + sha256 = "0yl1im3s4svl4hxxsyc60mm7cxvwz538amc9y0vzw6lkiii5f197"; + }; + dependencies = [ + "addressable" + "buftok" + "descendants_tracker" + "equalizer" + "faraday" + "http" + "http_parser.rb" + "json" + "memoizable" + "simple_oauth" + ]; + }; + "unf" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "1f2q8mxxngg8q608r6xajpharp9zz1ia3336y1lsg1asn2ach2sm"; + }; + dependencies = [ + "unf_ext" + ]; + }; + "unf_ext" = { + version = "0.0.6"; + source = { + type = "gem"; + sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg"; + }; + }; + "xml-simple" = { + version = "1.1.4"; + source = { + type = "gem"; + sha256 = "0x5c3mqhahh8hzqqq41659bxj0wn3n6bhj5p6b4hsia2k4akzg6s"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da628ae97ca..d7e2ddb8176 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,6 +657,8 @@ let azureus = callPackage ../tools/networking/p2p/azureus { }; + backup = callPackage ../tools/backup/backup { }; + basex = callPackage ../tools/text/xml/basex { }; babeld = callPackage ../tools/networking/babeld { }; From 214a9537c8b3c9b2d834eeda097b80c401a769e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 11:54:27 +0100 Subject: [PATCH 039/498] hostapd service: improve option descriptions --- nixos/modules/services/networking/hostapd.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2adbb0a5c4e..5a6ca139dda 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -53,11 +53,13 @@ in default = false; description = '' Enable putting a wireless interface into infrastructure mode, - allowing other wireless devices to associate with the wireless interface and do - wireless networking. A simple access point will enable hostapd.wpa, and - hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to - provide IP addresses to the associated stations, and nat (from the wireless - interface to an upstream interface). + allowing other wireless devices to associate with the wireless + interface and do wireless networking. A simple access point will + , + , and + , as well as DHCP on the wireless + interface to provide IP addresses to the associated stations, and + NAT (from the wireless interface to an upstream interface). ''; }; @@ -73,7 +75,10 @@ in default = "nl80211"; example = "hostapd"; type = types.string; - description = "Which driver hostapd will use. Most things will probably use the default."; + description = '' + Which driver hostapd will use. + Most applications will probably use the default. + ''; }; ssid = mkOption { @@ -87,7 +92,10 @@ in default = "b"; example = "g"; type = types.string; - description = "Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g"; + description = '' + Operation mode. + (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). + ''; }; channel = mkOption { @@ -97,8 +105,9 @@ in description = '' Channel number (IEEE 802.11) - Please note that some drivers do not use this value from hostapd and the - channel will need to be configured separately with iwconfig. + Please note that some drivers do not use this value from + hostapd and the channel will need to be configured + separately with iwconfig. ''; }; @@ -106,12 +115,16 @@ in default = "wheel"; example = "network"; type = types.string; - description = "members of this group can control hostapd"; + description = '' + Members of this group can control hostapd. + ''; }; wpa = mkOption { default = true; - description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point"; + description = '' + Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. + ''; }; wpaPassphrase = mkOption { @@ -121,8 +134,9 @@ in description = '' WPA-PSK (pre-shared-key) passphrase. Clients will need this - passphrase to associate with this access point. Warning: This passphrase will - get put into a world-readable file in the nix store. + passphrase to associate with this access point. + Warning: This passphrase will get put into a world-readable file in + the Nix store! ''; }; @@ -134,7 +148,7 @@ in ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40] ''; type = types.string; - description = "Extra configuration options to put in the hostapd.conf"; + description = "Extra configuration options to put in hostapd.conf."; }; }; }; From 256cec97561abcedd4a17f09c352af6e70e620df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 17:49:58 +0100 Subject: [PATCH 040/498] saneBackends 1.0.24 -> 1.0.25 Changes too numerous to list here: http://anonscm.debian.org/cgit/sane/sane-backends.git/tree/ChangeLog?h=RELEASE_1_0_25 --- pkgs/applications/graphics/sane/backends.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 66fc4810e7d..c4031a96108 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -8,16 +8,16 @@ let firmware = gt68xxFirmware { inherit fetchurl; }; in stdenv.mkDerivation rec { - version = "1.0.24"; + version = "1.0.25"; name = "sane-backends-${version}"; src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz" - "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz" + "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz" + "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz" ]; curlOpts = "--insecure"; - sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; + sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"; }; outputs = [ "out" "doc" "man" ]; From 5bcd13156c39e82bf31045bc2610fa148c49332a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 20:27:52 +0100 Subject: [PATCH 041/498] saneBackends: add myself as maintainer --- pkgs/applications/graphics/sane/backends.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index c4031a96108..c2319cd1b60 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation rec { " \${out}/share/sane/snapscan/your-firmwarefile.bin" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } From d3d5c79582c6d7e73458481f11ce1994b1c87d85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 21:47:46 +0100 Subject: [PATCH 042/498] saneBackendsGit 1.0.24.73-g6c4f6bc -> 1.0.25.177-g753d123 --- pkgs/applications/graphics/sane/backends-git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 67b733dda7a..8d9098b743b 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -7,12 +7,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.24.73-g6c4f6bc"; + name = "sane-backends-1.0.25.177-g753d123"; src = fetchgit { url = "git://alioth.debian.org/git/sane/sane-backends.git"; - rev = "6c4f6bc58615755dc734281703b594cea3ebf848"; - sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa"; + rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25"; + sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f"; }; udevSupport = hotplugSupport; From df4ab4c9cc378ec44cd50d45e01f36a09fd768c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 21:59:55 +0100 Subject: [PATCH 043/498] saneBackendsGit: add myself as maintainer --- pkgs/applications/graphics/sane/backends-git.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 8d9098b743b..785deaaa11c 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation { "echo epson2 > \${out}/etc/sane.d/dll.conf" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } From 1d4b4dc8b6f39a76f6b2a53c017852b04696a1aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Dec 2015 22:27:27 +0100 Subject: [PATCH 044/498] saneBackends{,Git}: add more descriptive descriptions --- pkgs/applications/graphics/sane/backends-git.nix | 9 ++++++++- pkgs/applications/graphics/sane/backends.nix | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 785deaaa11c..3de7057916a 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -40,7 +40,14 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx simons ]; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index c2319cd1b60..fb943ac23b5 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -51,7 +51,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx simons ]; From 7e066b13e7d241a4744c5024a25db0bb99eb246b Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sun, 6 Dec 2015 15:14:13 +1300 Subject: [PATCH 045/498] shellinabox: 2.16 -> 2.19 --- pkgs/servers/shellinabox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 37a546770a0..ed859ac344b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.19"; name = "shellinabox-${version}"; src = fetchFromGitHub { owner = "shellinabox"; repo = "shellinabox"; - rev = "8ac3a4efcf20f7b66d3f1eb1d4f3054aef6e196b"; - sha256 = "1pp6nk0279d2q7l1cvx8jc73skfjv0s42wxb2m00x0bg9i1fvs5j"; + rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd"; + sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan"; }; patches = [ ./shellinabox-minus.patch ]; From 1eaf571d427ed6e7d7efd4952d2454d8d887588f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 4 Dec 2015 12:22:07 +0100 Subject: [PATCH 046/498] pitivi: 0.94 -> 0.95 Notable (hard) dependency changes: - gstreamer >= 1.6.0 - gst-plugins-bad with GTK support (need "gstgtk" plugin) - pygobject >= 3.14 - gst-validate - matplotlib (used for drawing the "timeline") Changes v1 -> v2: pitivi no longer requires clutter, so I switched clutter-gtk => gtk3. --- pkgs/applications/video/pitivi/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 9515e118644..f135630a9a1 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, python3Packages, gst, clutter-gtk, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor_icon_theme , gobjectIntrospection, librsvg, gnome3, libnotify }: let - version = "0.94"; + version = "0.95"; in stdenv.mkDerivation rec { name = "pitivi-${version}"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm"; + sha256 = "04ykw619aikhxk5wj7z44pvwl52053d1kamcxpscw0ixrh5j45az"; }; meta = with stdenv.lib; { @@ -29,15 +29,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-editing-services gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav + gst-plugins-bad gst-plugins-ugly gst-libav gst-validate ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo sqlite3 + python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib ]); preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b9e340b077..4dd147d7ffe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2619,8 +2619,10 @@ let parted = callPackage ../tools/misc/parted { hurd = null; }; pitivi = callPackage ../applications/video/pitivi { - gst = gst_all_1; - clutter-gtk = clutter_gtk; + gst = gst_all_1 // + { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation + (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; }); + }; }; p0f = callPackage ../tools/security/p0f { }; From 7884923ba39798e27edc43820de324dc9ae73f87 Mon Sep 17 00:00:00 2001 From: codsl Date: Sat, 5 Dec 2015 17:50:48 +0000 Subject: [PATCH 047/498] tor: 0.2.6.10 -> 0.2.7.5, fixes #11489 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 525259bdb02..9e73c7d4053 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.10"; + name = "tor-0.2.7.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; + sha256 = "0pxayvcab4cb107ynbpzx4g0qyr1mjfba2an76wdx6dxn56rwakx"; }; # Note: torsocks is specified as a dependency, as the distributed From 088c3fc9dd0faca2013a2cb99f52458aa64c2f20 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 28 Oct 2015 14:13:16 +0100 Subject: [PATCH 048/498] virtualbox: 5.0.6 -> 5.0.10, fixes #11115 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b84272b7547..bc777c962d5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.6"; + version = "5.0.10"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "103037"; + extpackRevision = "104061"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5"; + sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0hsqd9bvbbzs3ihlfp2m15z6vx3nydjirv6drhfs6r9iqhl3zmi2"; + sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4ef62baa3d9..f4d8abb49ab 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991"; + sha256 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; From a84c4a66f70a844e2c3f3e5ac350089aedb51917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 6 Dec 2015 13:50:15 +0100 Subject: [PATCH 049/498] goPackages.openssl-spacemonkey: reintroduce openssl bindings --- pkgs/top-level/go-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5b7a254cc58..365508836f5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2124,6 +2124,18 @@ let ''; }; + # reintroduced for gocrytpfs as I don't understand the 10gen/spacemonkey split + openssl-spacemonkey = buildFromGitHub rec { + rev = "71f9da2a482c2b7bc3507c3fabaf714d6bb8b75d"; + name = "openssl-${stdenv.lib.strings.substring 0 7 rev}"; + owner = "spacemonkeygo"; + repo = "openssl"; + sha256 = "1byxwiq4mcbsj0wgaxqmyndp6jjn5gm8fjlsxw9bg0f33a3kn5jk"; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.openssl ]; + propagatedBuildInputs = [ spacelog ]; + }; + opsgenie-go-sdk = buildFromGitHub { rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; date = "2015-08-24"; From b195abe0919a8cbd929385b1167432958493f3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 6 Dec 2015 13:50:15 +0100 Subject: [PATCH 050/498] goPackages.gocryptfs: init at 0.5 --- pkgs/top-level/go-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 365508836f5..70dda19bc8e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -846,6 +846,14 @@ let sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47"; }; + gocryptfs = buildFromGitHub { + rev = "v0.5"; + owner = "rfjakob"; + repo = "gocryptfs"; + sha256 = "0jsdz8y7a1fkyrfwg6353c9r959qbqnmf2cjh57hp26w1za5bymd"; + buildInputs = [ crypto go-fuse openssl-spacemonkey ]; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; From 69b0661fa9df8016af3f63af93f228153473831f Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 29 Nov 2015 21:28:09 +0000 Subject: [PATCH 051/498] pump.io: init at git-2015-11-09 pump.io -- Social server with an ActivityStreams API The version from git master branch is used because released version 0.3 is not compatible with newer versions of nodejs. node-packages.json was extracted from pump.io package.json and augmented with the databank-{lrucache,memcached,mongodb,redis} driver packages. To regenerate, run: npm2nix pkgs/servers/web-apps/pump.io/node-packages.json pkgs/servers/web-apps/pump.io/node-packages.nix --- pkgs/servers/web-apps/pump.io/default.nix | 68 + .../web-apps/pump.io/node-packages.json | 36 + .../web-apps/pump.io/node-packages.nix | 2734 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 2840 insertions(+) create mode 100644 pkgs/servers/web-apps/pump.io/default.nix create mode 100644 pkgs/servers/web-apps/pump.io/node-packages.json create mode 100644 pkgs/servers/web-apps/pump.io/node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix new file mode 100644 index 00000000000..2d376593662 --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchFromGitHub, makeWrapper, callPackage, nodejs, python, utillinux, graphicsmagick }: + +with stdenv.lib; + +let + nodePackages = callPackage (import ../../../top-level/node-packages.nix) { + inherit stdenv nodejs fetchurl fetchgit; + neededNatives = [ python ] ++ optional stdenv.isLinux utillinux; + self = nodePackages; + generated = ./node-packages.nix; + }; + +in nodePackages.buildNodePackage rec { + version = "git-2015-11-09"; + name = "pump.io-${version}"; + + src = fetchFromGitHub { + owner = "e14n"; + repo = "pump.io"; + rev = "2f8d6b3518607ed02b594aee0db6ccacbe631b2d"; + sha256 = "1xym3jzpxlni1n2i0ixwrnpkx5fbnd1p6sm1hf9n3w5m2lx6gdw5"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); + + buildInputs = [ makeWrapper ]; + + postInstall = '' + for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do + wrapProgram "$out/bin/$prog" \ + --set NODE_PATH "$out/lib/node_modules/pump.io/node_modules/" \ + --prefix PATH : ${graphicsmagick}/bin:$out/bin + done + ''; + + passthru.names = ["pump.io"]; + + meta = { + description = "Social server with an ActivityStreams API"; + homepage = http://pump.io/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.rvl ]; + longDescription = '' + This is pump.io. It's a stream server that does most of what + people really want from a social network. + + What's it for? + + I post something and my followers see it. That's the rough idea + behind the pump. + + There's an API defined in the API.md file. It uses + activitystrea.ms JSON as the main data and command format. + + You can post almost anything that can be represented with + activity streams -- short or long text, bookmarks, images, + video, audio, events, geo checkins. You can follow friends, + create lists of people, and so on. + + The software is useful for at least these scenarios: + + * Mobile-first social networking + * Activity stream functionality for an existing app + * Experimenting with social software + ''; + }; +} diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json new file mode 100644 index 00000000000..10d50a0c72e --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/node-packages.json @@ -0,0 +1,36 @@ +{ + "name": "pump.io", + "dependencies": { + "bcrypt": "0.8.x", + "bunyan": "0.16.x", + "connect": "1.x", + "connect-auth": "0.5.3", + "connect-databank": "0.13.x", + "crypto-cacerts": "0.1.x", + "databank": "0.19.x", + "databank-lrucache": "^0.1.2", + "databank-memcached": "^0.15.0", + "databank-mongodb": "^0.18.10", + "databank-redis": "^0.19.6", + "dateformat": "1.x", + "dialback-client": "~0.1.5", + "emailjs": "0.3.x", + "express": "2.5.x", + "gm": "1.9.x", + "jankyqueue": "0.1.x", + "mkdirp": "0.3.x", + "node-uuid": "1.3.x", + "oauth-evanp": "~0.9.10-evanp.2", + "optimist": "0.3.x", + "schlock": "~0.2.1", + "set-immediate": "0.1.x", + "showdown": "0.3.x", + "sockjs": "0.3.x", + "step": "0.0.x", + "underscore": "1.4.x", + "underscore-contrib": "0.1.x", + "utml": "0.2.x", + "validator": "0.4.x", + "webfinger": "~0.4.2" + } +} diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix new file mode 100644 index 00000000000..4d6272511aa --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -0,0 +1,2734 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."addressparser"."^0.3.2" = + self.by-version."addressparser"."0.3.2"; + by-version."addressparser"."0.3.2" = self.buildNodePackage { + name = "addressparser-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + name = "addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."addressparser"."~0.2.0" = + self.by-version."addressparser"."0.2.1"; + by-version."addressparser"."0.2.1" = self.buildNodePackage { + name = "addressparser-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; + name = "addressparser-0.2.1.tgz"; + sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-parallel"."~0.1.0" = + self.by-version."array-parallel"."0.1.3"; + by-version."array-parallel"."0.1.3" = self.buildNodePackage { + name = "array-parallel-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + name = "array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-series"."~0.1.0" = + self.by-version."array-series"."0.1.5"; + by-version."array-series"."0.1.5" = self.buildNodePackage { + name = "array-series-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + name = "array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.9.x" = + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = self.buildNodePackage { + name = "async-0.9.2"; + version = "0.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bcrypt"."0.8.x" = + self.by-version."bcrypt"."0.8.5"; + by-version."bcrypt"."0.8.5" = self.buildNodePackage { + name = "bcrypt-0.8.5"; + version = "0.8.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.5.tgz"; + name = "bcrypt-0.8.5.tgz"; + sha1 = "8e5b81b4db80e944f440005979ca8d58a961861d"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-2.0.5" = self.by-version."nan"."2.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bcrypt" = self.by-version."bcrypt"."0.8.5"; + by-spec."bindings"."1.2.1" = + self.by-version."bindings"."1.2.1"; + by-version."bindings"."1.2.1" = self.buildNodePackage { + name = "bindings-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + name = "bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bisection"."*" = + self.by-version."bisection"."0.0.3"; + by-version."bisection"."0.0.3" = self.buildNodePackage { + name = "bisection-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; + name = "bisection-0.0.3.tgz"; + sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bson"."~0.2" = + self.by-version."bson"."0.2.22"; + by-version."bson"."0.2.22" = self.buildNodePackage { + name = "bson-0.2.22"; + version = "0.2.22"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bson/-/bson-0.2.22.tgz"; + name = "bson-0.2.22.tgz"; + sha1 = "fcda103f26d0c074d5a52d50927db80fd02b4b39"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bufferjs"."=1.1.0" = + self.by-version."bufferjs"."1.1.0"; + by-version."bufferjs"."1.1.0" = self.buildNodePackage { + name = "bufferjs-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; + name = "bufferjs-1.1.0.tgz"; + sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."builtin-modules"."^1.0.0" = + self.by-version."builtin-modules"."1.1.0"; + by-version."builtin-modules"."1.1.0" = self.buildNodePackage { + name = "builtin-modules-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"; + name = "builtin-modules-1.1.0.tgz"; + sha1 = "1053955fd994a5746e525e4ac717b81caf07491c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bunyan"."0.16.x" = + self.by-version."bunyan"."0.16.8"; + by-version."bunyan"."0.16.8" = self.buildNodePackage { + name = "bunyan-0.16.8"; + version = "0.16.8"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/bunyan/-/bunyan-0.16.8.tgz"; + name = "bunyan-0.16.8.tgz"; + sha1 = "3b3f6cdca262fa31aba43eb0eb6fb58e7bdde547"; + }; + deps = { + "dtrace-provider-0.2.4" = self.by-version."dtrace-provider"."0.2.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bunyan" = self.by-version."bunyan"."0.16.8"; + by-spec."camelcase"."^2.0.0" = + self.by-version."camelcase"."2.0.1"; + by-version."camelcase"."2.0.1" = self.buildNodePackage { + name = "camelcase-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; + name = "camelcase-2.0.1.tgz"; + sha1 = "57568d687b8da56c4c1d17b4c74a3cee26d73aeb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."camelcase-keys"."^2.0.0" = + self.by-version."camelcase-keys"."2.0.0"; + by-version."camelcase-keys"."2.0.0" = self.buildNodePackage { + name = "camelcase-keys-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz"; + name = "camelcase-keys-2.0.0.tgz"; + sha1 = "ab87e740d72a1ffcb12a43cc04c14b39d549eab9"; + }; + deps = { + "camelcase-2.0.1" = self.by-version."camelcase"."2.0.1"; + "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect"."1.x" = + self.by-version."connect"."1.9.2"; + by-version."connect"."1.9.2" = self.buildNodePackage { + name = "connect-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + name = "connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + deps = { + "qs-6.0.1" = self.by-version."qs"."6.0.1"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect" = self.by-version."connect"."1.9.2"; + by-spec."connect"."2.0.0" = + self.by-version."connect"."2.0.0"; + by-version."connect"."2.0.0" = self.buildNodePackage { + name = "connect-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.0.0.tgz"; + name = "connect-2.0.0.tgz"; + sha1 = "be0f8fcee7c1a0e2caa2e246a278dbbe250b9f27"; + }; + deps = { + "qs-0.4.2" = self.by-version."qs"."0.4.2"; + "mime-1.2.4" = self.by-version."mime"."1.2.4"; + "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect-auth"."0.5.3" = + self.by-version."connect-auth"."0.5.3"; + by-version."connect-auth"."0.5.3" = self.buildNodePackage { + name = "connect-auth-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-auth/-/connect-auth-0.5.3.tgz"; + name = "connect-auth-0.5.3.tgz"; + sha1 = "2af00ac6f67ac1c5f451a0ff841a8d20a725091e"; + }; + deps = { + "connect-2.0.0" = self.by-version."connect"."2.0.0"; + "oauth-0.9.7" = self.by-version."oauth"."0.9.7"; + "openid-0.4.1" = self.by-version."openid"."0.4.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect-auth" = self.by-version."connect-auth"."0.5.3"; + by-spec."connect-databank"."0.13.x" = + self.by-version."connect-databank"."0.13.0"; + by-version."connect-databank"."0.13.0" = self.buildNodePackage { + name = "connect-databank-0.13.0"; + version = "0.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-databank/-/connect-databank-0.13.0.tgz"; + name = "connect-databank-0.13.0.tgz"; + sha1 = "0d5063e9402381073e0242fd7c6ef28b2d61676b"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect-databank" = self.by-version."connect-databank"."0.13.0"; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.2"; + by-version."core-util-is"."1.0.2" = self.buildNodePackage { + name = "core-util-is-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + name = "core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."crypto-cacerts"."0.1.x" = + self.by-version."crypto-cacerts"."0.1.0"; + by-version."crypto-cacerts"."0.1.0" = self.buildNodePackage { + name = "crypto-cacerts-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; + name = "crypto-cacerts-0.1.0.tgz"; + sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "crypto-cacerts" = self.by-version."crypto-cacerts"."0.1.0"; + by-spec."databank"."0.18.x" = + self.by-version."databank"."0.18.2"; + by-version."databank"."0.18.2" = self.buildNodePackage { + name = "databank-0.18.2"; + version = "0.18.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; + name = "databank-0.18.2.tgz"; + sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; + }; + deps = { + "vows-0.7.0" = self.by-version."vows"."0.7.0"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."databank"."0.19.x" = + self.by-version."databank"."0.19.1"; + by-version."databank"."0.19.1" = self.buildNodePackage { + name = "databank-0.19.1"; + version = "0.19.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank/-/databank-0.19.1.tgz"; + name = "databank-0.19.1.tgz"; + sha1 = "95c6f662927b891f62c6f07fefe5e690fbe666e0"; + }; + deps = { + "vows-0.7.0" = self.by-version."vows"."0.7.0"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank" = self.by-version."databank"."0.19.1"; + by-spec."databank"."~0.19.1" = + self.by-version."databank"."0.19.1"; + by-spec."databank-lrucache"."^0.1.2" = + self.by-version."databank-lrucache"."0.1.2"; + by-version."databank-lrucache"."0.1.2" = self.buildNodePackage { + name = "databank-lrucache-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; + name = "databank-lrucache-0.1.2.tgz"; + sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + }; + deps = { + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; + "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-lrucache" = self.by-version."databank-lrucache"."0.1.2"; + by-spec."databank-memcached"."^0.15.0" = + self.by-version."databank-memcached"."0.15.0"; + by-version."databank-memcached"."0.15.0" = self.buildNodePackage { + name = "databank-memcached-0.15.0"; + version = "0.15.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; + name = "databank-memcached-0.15.0.tgz"; + sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; + }; + deps = { + "memcached-0.2.8" = self.by-version."memcached"."0.2.8"; + "databank-0.18.2" = self.by-version."databank"."0.18.2"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-memcached" = self.by-version."databank-memcached"."0.15.0"; + by-spec."databank-mongodb"."^0.18.10" = + self.by-version."databank-mongodb"."0.18.10"; + by-version."databank-mongodb"."0.18.10" = self.buildNodePackage { + name = "databank-mongodb-0.18.10"; + version = "0.18.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.18.10.tgz"; + name = "databank-mongodb-0.18.10.tgz"; + sha1 = "5f9d37059d024f1116bdca05459f9c033b0d8ae5"; + }; + deps = { + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "mongodb-1.4.39" = self.by-version."mongodb"."1.4.39"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-mongodb" = self.by-version."databank-mongodb"."0.18.10"; + by-spec."databank-redis"."^0.19.6" = + self.by-version."databank-redis"."0.19.6"; + by-version."databank-redis"."0.19.6" = self.buildNodePackage { + name = "databank-redis-0.19.6"; + version = "0.19.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; + name = "databank-redis-0.19.6.tgz"; + sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; + }; + deps = { + "async-0.9.2" = self.by-version."async"."0.9.2"; + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "redis-0.10.3" = self.by-version."redis"."0.10.3"; + "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-redis" = self.by-version."databank-redis"."0.19.6"; + by-spec."dateformat"."1.x" = + self.by-version."dateformat"."1.0.12"; + by-version."dateformat"."1.0.12" = self.buildNodePackage { + name = "dateformat-1.0.12"; + version = "1.0.12"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + name = "dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + "meow-3.6.0" = self.by-version."meow"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "dateformat" = self.by-version."dateformat"."1.0.12"; + by-spec."debug"."*" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."0.7.0" = + self.by-version."debug"."0.7.0"; + by-version."debug"."0.7.0" = self.buildNodePackage { + name = "debug-0.7.0"; + version = "0.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; + name = "debug-0.7.0.tgz"; + sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dialback-client"."~0.1.5" = + self.by-version."dialback-client"."0.1.5"; + by-version."dialback-client"."0.1.5" = self.buildNodePackage { + name = "dialback-client-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dialback-client/-/dialback-client-0.1.5.tgz"; + name = "dialback-client-0.1.5.tgz"; + sha1 = "ff37f58554ac7dca79a219ba3e6e7c5ed4cc0745"; + }; + deps = { + "express-2.5.11" = self.by-version."express"."2.5.11"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "databank-0.18.2" = self.by-version."databank"."0.18.2"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "dialback-client" = self.by-version."dialback-client"."0.1.5"; + by-spec."diff"."~1.0.3" = + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = self.buildNodePackage { + name = "diff-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dtrace-provider"."0.2.4" = + self.by-version."dtrace-provider"."0.2.4"; + by-version."dtrace-provider"."0.2.4" = self.buildNodePackage { + name = "dtrace-provider-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.4.tgz"; + name = "dtrace-provider-0.2.4.tgz"; + sha1 = "0719d4449c8994cc89e317cf0d732213f94653d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."emailjs"."0.3.x" = + self.by-version."emailjs"."0.3.16"; + by-version."emailjs"."0.3.16" = self.buildNodePackage { + name = "emailjs-0.3.16"; + version = "0.3.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/emailjs/-/emailjs-0.3.16.tgz"; + name = "emailjs-0.3.16.tgz"; + sha1 = "f162735352ce7b6615a5d811714051f90f23331d"; + }; + deps = { + "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; + "mimelib-0.2.14" = self.by-version."mimelib"."0.2.14"; + "moment-1.7.0" = self.by-version."moment"."1.7.0"; + "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; + }; + optionalDependencies = { + "bufferjs-1.1.0" = self.by-version."bufferjs"."1.1.0"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "emailjs" = self.by-version."emailjs"."0.3.16"; + by-spec."encoding"."~0.1" = + self.by-version."encoding"."0.1.11"; + by-version."encoding"."0.1.11" = self.buildNodePackage { + name = "encoding-0.1.11"; + version = "0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; + name = "encoding-0.1.11.tgz"; + sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; + }; + deps = { + "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."error-ex"."^1.2.0" = + self.by-version."error-ex"."1.3.0"; + by-version."error-ex"."1.3.0" = self.buildNodePackage { + name = "error-ex-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + name = "error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + deps = { + "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."2.5.x" = + self.by-version."express"."2.5.11"; + by-version."express"."2.5.11" = self.buildNodePackage { + name = "express-2.5.11"; + version = "2.5.11"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; + name = "express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + deps = { + "connect-1.9.2" = self.by-version."connect"."1.9.2"; + "mime-1.2.4" = self.by-version."mime"."1.2.4"; + "qs-0.4.2" = self.by-version."qs"."0.4.2"; + "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "express" = self.by-version."express"."2.5.11"; + by-spec."eyes".">=0.1.6" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."faye-websocket"."^0.9.3" = + self.by-version."faye-websocket"."0.9.4"; + by-version."faye-websocket"."0.9.4" = self.buildNodePackage { + name = "faye-websocket-0.9.4"; + version = "0.9.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz"; + name = "faye-websocket-0.9.4.tgz"; + sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad"; + }; + deps = { + "websocket-driver-0.6.3" = self.by-version."websocket-driver"."0.6.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."find-up"."^1.0.0" = + self.by-version."find-up"."1.1.0"; + by-version."find-up"."1.1.0" = self.buildNodePackage { + name = "find-up-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz"; + name = "find-up-1.1.0.tgz"; + sha1 = "a63b0eec4625a2902534898a5f9eec8aaed046e9"; + }; + deps = { + "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formidable"."1.0.x" = + self.by-version."formidable"."1.0.17"; + by-version."formidable"."1.0.17" = self.buildNodePackage { + name = "formidable-1.0.17"; + version = "1.0.17"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + name = "formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."get-stdin"."^4.0.1" = + self.by-version."get-stdin"."4.0.1"; + by-version."get-stdin"."4.0.1" = self.buildNodePackage { + name = "get-stdin-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + name = "get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gm"."1.9.x" = + self.by-version."gm"."1.9.2"; + by-version."gm"."1.9.2" = self.buildNodePackage { + name = "gm-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gm/-/gm-1.9.2.tgz"; + name = "gm-1.9.2.tgz"; + sha1 = "00443279fe959a10fa23025e0c8401e710215845"; + }; + deps = { + "debug-0.7.0" = self.by-version."debug"."0.7.0"; + "array-series-0.1.5" = self.by-version."array-series"."0.1.5"; + "array-parallel-0.1.3" = self.by-version."array-parallel"."0.1.3"; + "through-2.3.8" = self.by-version."through"."2.3.8"; + "stream-to-buffer-0.0.1" = self.by-version."stream-to-buffer"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "gm" = self.by-version."gm"."1.9.2"; + by-spec."graceful-fs"."^4.1.2" = + self.by-version."graceful-fs"."4.1.2"; + by-version."graceful-fs"."4.1.2" = self.buildNodePackage { + name = "graceful-fs-4.1.2"; + version = "4.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"; + name = "graceful-fs-4.1.2.tgz"; + sha1 = "fe2239b7574972e67e41f808823f9bfa4a991e37"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hashring"."0.0.x" = + self.by-version."hashring"."0.0.8"; + by-version."hashring"."0.0.8" = self.buildNodePackage { + name = "hashring-0.0.8"; + version = "0.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; + name = "hashring-0.0.8.tgz"; + sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; + }; + deps = { + "bisection-0.0.3" = self.by-version."bisection"."0.0.3"; + "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hosted-git-info"."^2.1.4" = + self.by-version."hosted-git-info"."2.1.4"; + by-version."hosted-git-info"."2.1.4" = self.buildNodePackage { + name = "hosted-git-info-2.1.4"; + version = "2.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"; + name = "hosted-git-info-2.1.4.tgz"; + sha1 = "d9e953b26988be88096c46e926494d9604c300f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."iconv-lite"."~0.4.4" = + self.by-version."iconv-lite"."0.4.13"; + by-version."iconv-lite"."0.4.13" = self.buildNodePackage { + name = "iconv-lite-0.4.13"; + version = "0.4.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + name = "iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."indent-string"."^2.1.0" = + self.by-version."indent-string"."2.1.0"; + by-version."indent-string"."2.1.0" = self.buildNodePackage { + name = "indent-string-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + name = "indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + deps = { + "repeating-2.0.0" = self.by-version."repeating"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-arrayish"."^0.2.1" = + self.by-version."is-arrayish"."0.2.1"; + by-version."is-arrayish"."0.2.1" = self.buildNodePackage { + name = "is-arrayish-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + name = "is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-builtin-module"."^1.0.0" = + self.by-version."is-builtin-module"."1.0.0"; + by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { + name = "is-builtin-module-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + name = "is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + deps = { + "builtin-modules-1.1.0" = self.by-version."builtin-modules"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-finite"."^1.0.0" = + self.by-version."is-finite"."1.0.1"; + by-version."is-finite"."1.0.1" = self.buildNodePackage { + name = "is-finite-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; + name = "is-finite-1.0.1.tgz"; + sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + }; + deps = { + "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-utf8"."^0.2.0" = + self.by-version."is-utf8"."0.2.0"; + by-version."is-utf8"."0.2.0" = self.buildNodePackage { + name = "is-utf8-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"; + name = "is-utf8-0.2.0.tgz"; + sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jackpot".">=0.0.6" = + self.by-version."jackpot"."0.0.6"; + by-version."jackpot"."0.0.6" = self.buildNodePackage { + name = "jackpot-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; + name = "jackpot-0.0.6.tgz"; + sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; + }; + deps = { + "retry-0.6.0" = self.by-version."retry"."0.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jankyqueue"."0.1.x" = + self.by-version."jankyqueue"."0.1.1"; + by-version."jankyqueue"."0.1.1" = self.buildNodePackage { + name = "jankyqueue-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; + name = "jankyqueue-0.1.1.tgz"; + sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jankyqueue" = self.by-version."jankyqueue"."0.1.1"; + by-spec."kerberos"."0.0.11" = + self.by-version."kerberos"."0.0.11"; + by-version."kerberos"."0.0.11" = self.buildNodePackage { + name = "kerberos-0.0.11"; + version = "0.0.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.11.tgz"; + name = "kerberos-0.0.11.tgz"; + sha1 = "cb29891c21c22ac195f3140b97dd12204fea7dc2"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."load-json-file"."^1.0.0" = + self.by-version."load-json-file"."1.1.0"; + by-version."load-json-file"."1.1.0" = self.buildNodePackage { + name = "load-json-file-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + name = "load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + deps = { + "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; + "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."loud-rejection"."^1.0.0" = + self.by-version."loud-rejection"."1.2.0"; + by-version."loud-rejection"."1.2.0" = self.buildNodePackage { + name = "loud-rejection-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"; + name = "loud-rejection-1.2.0.tgz"; + sha1 = "f4f87db6abec3b7fe47834531ecf6a011143e58d"; + }; + deps = { + "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."2.3.x" = + self.by-version."lru-cache"."2.3.1"; + by-version."lru-cache"."2.3.1" = self.buildNodePackage { + name = "lru-cache-2.3.1"; + version = "2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + name = "lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."map-obj"."^1.0.0" = + self.by-version."map-obj"."1.0.1"; + by-version."map-obj"."1.0.1" = self.buildNodePackage { + name = "map-obj-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + name = "map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."memcached"."0.2.x" = + self.by-version."memcached"."0.2.8"; + by-version."memcached"."0.2.8" = self.buildNodePackage { + name = "memcached-0.2.8"; + version = "0.2.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; + name = "memcached-0.2.8.tgz"; + sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; + }; + deps = { + "hashring-0.0.8" = self.by-version."hashring"."0.0.8"; + "jackpot-0.0.6" = self.by-version."jackpot"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."meow"."^3.3.0" = + self.by-version."meow"."3.6.0"; + by-version."meow"."3.6.0" = self.buildNodePackage { + name = "meow-3.6.0"; + version = "3.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/meow/-/meow-3.6.0.tgz"; + name = "meow-3.6.0.tgz"; + sha1 = "e7a535295cb89db0e0782428e55fa8615bf9e150"; + }; + deps = { + "camelcase-keys-2.0.0" = self.by-version."camelcase-keys"."2.0.0"; + "loud-rejection-1.2.0" = self.by-version."loud-rejection"."1.2.0"; + "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; + "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1"; + "redent-1.0.0" = self.by-version."redent"."1.0.0"; + "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.2.4" = + self.by-version."mime"."1.2.4"; + by-version."mime"."1.2.4" = self.buildNodePackage { + name = "mime-1.2.4"; + version = "1.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + name = "mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime".">= 0.0.1" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + version = "1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mimelib"."0.2.14" = + self.by-version."mimelib"."0.2.14"; + by-version."mimelib"."0.2.14" = self.buildNodePackage { + name = "mimelib-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + name = "mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; + }; + deps = { + "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; + "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."^1.1.3" = + self.by-version."minimist"."1.2.0"; + by-version."minimist"."1.2.0" = self.buildNodePackage { + name = "minimist-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + name = "minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.0" = + self.by-version."mkdirp"."0.3.0"; + by-version."mkdirp"."0.3.0" = self.buildNodePackage { + name = "mkdirp-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.x" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = self.buildNodePackage { + name = "mkdirp-0.3.5"; + version = "0.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."moment"."= 1.7.0" = + self.by-version."moment"."1.7.0"; + by-version."moment"."1.7.0" = self.buildNodePackage { + name = "moment-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-1.7.0.tgz"; + name = "moment-1.7.0.tgz"; + sha1 = "6f3d73a446c6bd6af1b993801d0b8071efad5e28"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mongodb"."1.4.x" = + self.by-version."mongodb"."1.4.39"; + by-version."mongodb"."1.4.39" = self.buildNodePackage { + name = "mongodb-1.4.39"; + version = "1.4.39"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.39.tgz"; + name = "mongodb-1.4.39.tgz"; + sha1 = "f5b25c7f7df06c968cd5d3c68280adc9a6404591"; + }; + deps = { + "bson-0.2.22" = self.by-version."bson"."0.2.22"; + }; + optionalDependencies = { + "kerberos-0.0.11" = self.by-version."kerberos"."0.0.11"; + "readable-stream-2.0.4" = self.by-version."readable-stream"."2.0.4"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."2.0.5" = + self.by-version."nan"."2.0.5"; + by-version."nan"."2.0.5" = self.buildNodePackage { + name = "nan-2.0.5"; + version = "2.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-2.0.5.tgz"; + name = "nan-2.0.5.tgz"; + sha1 = "365888014be1fd178db0cbfa258edf7b0cb1c408"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."~1.8" = + self.by-version."nan"."1.8.4"; + by-version."nan"."1.8.4" = self.buildNodePackage { + name = "nan-1.8.4"; + version = "1.8.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; + name = "nan-1.8.4.tgz"; + sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."1.3.x" = + self.by-version."node-uuid"."1.3.3"; + by-version."node-uuid"."1.3.3" = self.buildNodePackage { + name = "node-uuid-1.3.3"; + version = "1.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; + name = "node-uuid-1.3.3.tgz"; + sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-uuid" = self.by-version."node-uuid"."1.3.3"; + by-spec."node-uuid"."1.4.x" = + self.by-version."node-uuid"."1.4.7"; + by-version."node-uuid"."1.4.7" = self.buildNodePackage { + name = "node-uuid-1.4.7"; + version = "1.4.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + name = "node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."^1.4.1" = + self.by-version."node-uuid"."1.4.7"; + by-spec."normalize-package-data"."^2.3.2" = + self.by-version."normalize-package-data"."2.3.5"; + by-version."normalize-package-data"."2.3.5" = self.buildNodePackage { + name = "normalize-package-data-2.3.5"; + version = "2.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + name = "normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + deps = { + "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4"; + "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0"; + "semver-5.1.0" = self.by-version."semver"."5.1.0"; + "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."normalize-package-data"."^2.3.4" = + self.by-version."normalize-package-data"."2.3.5"; + by-spec."number-is-nan"."^1.0.0" = + self.by-version."number-is-nan"."1.0.0"; + by-version."number-is-nan"."1.0.0" = self.buildNodePackage { + name = "number-is-nan-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + name = "number-is-nan-1.0.0.tgz"; + sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth"."0.9.7" = + self.by-version."oauth"."0.9.7"; + by-version."oauth"."0.9.7" = self.buildNodePackage { + name = "oauth-0.9.7"; + version = "0.9.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; + name = "oauth-0.9.7.tgz"; + sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-evanp"."~0.9.10-evanp.2" = + self.by-version."oauth-evanp"."0.9.10-evanp.2"; + by-version."oauth-evanp"."0.9.10-evanp.2" = self.buildNodePackage { + name = "oauth-evanp-0.9.10-evanp.2"; + version = "0.9.10-evanp.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; + name = "oauth-evanp-0.9.10-evanp.2.tgz"; + sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "oauth-evanp" = self.by-version."oauth-evanp"."0.9.10-evanp.2"; + by-spec."object-assign"."^4.0.1" = + self.by-version."object-assign"."4.0.1"; + by-version."object-assign"."4.0.1" = self.buildNodePackage { + name = "object-assign-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"; + name = "object-assign-4.0.1.tgz"; + sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."openid"."0.4.1" = + self.by-version."openid"."0.4.1"; + by-version."openid"."0.4.1" = self.buildNodePackage { + name = "openid-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; + name = "openid-0.4.1.tgz"; + sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."0.3.x" = + self.by-version."optimist"."0.3.7"; + by-version."optimist"."0.3.7" = self.buildNodePackage { + name = "optimist-0.3.7"; + version = "0.3.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "optimist" = self.by-version."optimist"."0.3.7"; + by-spec."parse-json"."^2.2.0" = + self.by-version."parse-json"."2.2.0"; + by-version."parse-json"."2.2.0" = self.buildNodePackage { + name = "parse-json-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + name = "parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + deps = { + "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-exists"."^2.0.0" = + self.by-version."path-exists"."2.1.0"; + by-version."path-exists"."2.1.0" = self.buildNodePackage { + name = "path-exists-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + name = "path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + deps = { + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-type"."^1.0.0" = + self.by-version."path-type"."1.1.0"; + by-version."path-type"."1.1.0" = self.buildNodePackage { + name = "path-type-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + name = "path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + deps = { + "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pify"."^2.0.0" = + self.by-version."pify"."2.3.0"; + by-version."pify"."2.3.0" = self.buildNodePackage { + name = "pify-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + name = "pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie"."^2.0.0" = + self.by-version."pinkie"."2.0.1"; + by-version."pinkie"."2.0.1" = self.buildNodePackage { + name = "pinkie-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"; + name = "pinkie-2.0.1.tgz"; + sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie-promise"."^2.0.0" = + self.by-version."pinkie-promise"."2.0.0"; + by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { + name = "pinkie-promise-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; + name = "pinkie-promise-2.0.0.tgz"; + sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; + }; + deps = { + "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."process-nextick-args"."~1.0.0" = + self.by-version."process-nextick-args"."1.0.6"; + by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { + name = "process-nextick-args-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; + name = "process-nextick-args-1.0.6.tgz"; + sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."0.4.x" = + self.by-version."qs"."0.4.2"; + by-version."qs"."0.4.2" = self.buildNodePackage { + name = "qs-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + name = "qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs".">= 0.4.0" = + self.by-version."qs"."6.0.1"; + by-version."qs"."6.0.1" = self.buildNodePackage { + name = "qs-6.0.1"; + version = "6.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-6.0.1.tgz"; + name = "qs-6.0.1.tgz"; + sha1 = "ee8b7fcd64fcbe6e36c922bd2c464ee7c54766c3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg"."^1.0.0" = + self.by-version."read-pkg"."1.1.0"; + by-version."read-pkg"."1.1.0" = self.buildNodePackage { + name = "read-pkg-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + name = "read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + deps = { + "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "path-type-1.1.0" = self.by-version."path-type"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg-up"."^1.0.1" = + self.by-version."read-pkg-up"."1.0.1"; + by-version."read-pkg-up"."1.0.1" = self.buildNodePackage { + name = "read-pkg-up-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + name = "read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + deps = { + "find-up-1.1.0" = self.by-version."find-up"."1.1.0"; + "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."*" = + self.by-version."readable-stream"."2.0.4"; + by-version."readable-stream"."2.0.4" = self.buildNodePackage { + name = "readable-stream-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz"; + name = "readable-stream-2.0.4.tgz"; + sha1 = "2523ef27ffa339d7ba9da8603f2d0599d06edbd8"; + }; + deps = { + "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."redent"."^1.0.0" = + self.by-version."redent"."1.0.0"; + by-version."redent"."1.0.0" = self.buildNodePackage { + name = "redent-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + name = "redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + deps = { + "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0"; + "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."redis"."~0.10.3" = + self.by-version."redis"."0.10.3"; + by-version."redis"."0.10.3" = self.buildNodePackage { + name = "redis-0.10.3"; + version = "0.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + name = "redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."repeating"."^2.0.0" = + self.by-version."repeating"."2.0.0"; + by-version."repeating"."2.0.0" = self.buildNodePackage { + name = "repeating-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"; + name = "repeating-2.0.0.tgz"; + sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e"; + }; + deps = { + "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."retry"."0.6.0" = + self.by-version."retry"."0.6.0"; + by-version."retry"."0.6.0" = self.buildNodePackage { + name = "retry-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + name = "retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sax".">=0.1.1" = + self.by-version."sax"."1.1.4"; + by-version."sax"."1.1.4" = self.buildNodePackage { + name = "sax-1.1.4"; + version = "1.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + name = "sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."schlock"."~0.2.1" = + self.by-version."schlock"."0.2.1"; + by-version."schlock"."0.2.1" = self.buildNodePackage { + name = "schlock-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; + name = "schlock-0.2.1.tgz"; + sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "schlock" = self.by-version."schlock"."0.2.1"; + by-spec."semver"."2 || 3 || 4 || 5" = + self.by-version."semver"."5.1.0"; + by-version."semver"."5.1.0" = self.buildNodePackage { + name = "semver-5.1.0"; + version = "5.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + name = "semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."set-immediate"."0.1.x" = + self.by-version."set-immediate"."0.1.1"; + by-version."set-immediate"."0.1.1" = self.buildNodePackage { + name = "set-immediate-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; + name = "set-immediate-0.1.1.tgz"; + sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "set-immediate" = self.by-version."set-immediate"."0.1.1"; + by-spec."set-immediate"."~0.1.1" = + self.by-version."set-immediate"."0.1.1"; + by-spec."showdown"."0.3.x" = + self.by-version."showdown"."0.3.4"; + by-version."showdown"."0.3.4" = self.buildNodePackage { + name = "showdown-0.3.4"; + version = "0.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/showdown/-/showdown-0.3.4.tgz"; + name = "showdown-0.3.4.tgz"; + sha1 = "b056fa0209d44ac55c90331b44a934774976ac55"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "showdown" = self.by-version."showdown"."0.3.4"; + by-spec."signal-exit"."^2.1.2" = + self.by-version."signal-exit"."2.1.2"; + by-version."signal-exit"."2.1.2" = self.buildNodePackage { + name = "signal-exit-2.1.2"; + version = "2.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"; + name = "signal-exit-2.1.2.tgz"; + sha1 = "375879b1f92ebc3b334480d038dc546a6d558564"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.2"; + by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { + name = "simple-lru-cache-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + name = "simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sockjs"."0.3.x" = + self.by-version."sockjs"."0.3.15"; + by-version."sockjs"."0.3.15" = self.buildNodePackage { + name = "sockjs-0.3.15"; + version = "0.3.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz"; + name = "sockjs-0.3.15.tgz"; + sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8"; + }; + deps = { + "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sockjs" = self.by-version."sockjs"."0.3.15"; + by-spec."spdx-correct"."~1.0.0" = + self.by-version."spdx-correct"."1.0.2"; + by-version."spdx-correct"."1.0.2" = self.buildNodePackage { + name = "spdx-correct-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + name = "spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + deps = { + "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-exceptions"."^1.0.4" = + self.by-version."spdx-exceptions"."1.0.4"; + by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage { + name = "spdx-exceptions-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"; + name = "spdx-exceptions-1.0.4.tgz"; + sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-expression-parse"."~1.0.0" = + self.by-version."spdx-expression-parse"."1.0.2"; + by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage { + name = "spdx-expression-parse-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"; + name = "spdx-expression-parse-1.0.2.tgz"; + sha1 = "d52b14b5e9670771440af225bcb563122ac452f6"; + }; + deps = { + "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; + "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.0" = + self.by-version."spdx-license-ids"."1.1.0"; + by-version."spdx-license-ids"."1.1.0" = self.buildNodePackage { + name = "spdx-license-ids-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"; + name = "spdx-license-ids-1.1.0.tgz"; + sha1 = "28694acdf39fe27de45143fff81f21f6c66d44ac"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.2" = + self.by-version."spdx-license-ids"."1.1.0"; + by-spec."starttls"."0.2.1" = + self.by-version."starttls"."0.2.1"; + by-version."starttls"."0.2.1" = self.buildNodePackage { + name = "starttls-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; + name = "starttls-0.2.1.tgz"; + sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."step"."0.0.x" = + self.by-version."step"."0.0.6"; + by-version."step"."0.0.6" = self.buildNodePackage { + name = "step-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/step/-/step-0.0.6.tgz"; + name = "step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "step" = self.by-version."step"."0.0.6"; + by-spec."stream-to-buffer"."~0.0.1" = + self.by-version."stream-to-buffer"."0.0.1"; + by-version."stream-to-buffer"."0.0.1" = self.buildNodePackage { + name = "stream-to-buffer-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.0.1.tgz"; + name = "stream-to-buffer-0.0.1.tgz"; + sha1 = "ab483d59a1ca71832de379a255f465b665af45c1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-bom"."^2.0.0" = + self.by-version."strip-bom"."2.0.0"; + by-version."strip-bom"."2.0.0" = self.buildNodePackage { + name = "strip-bom-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + name = "strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + deps = { + "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-indent"."^1.0.1" = + self.by-version."strip-indent"."1.0.1"; + by-version."strip-indent"."1.0.1" = self.buildNodePackage { + name = "strip-indent-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + name = "strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."~2.3.1" = + self.by-version."through"."2.3.8"; + by-version."through"."2.3.8" = self.buildNodePackage { + name = "through-2.3.8"; + version = "2.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + name = "through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."trim-newlines"."^1.0.0" = + self.by-version."trim-newlines"."1.0.0"; + by-version."trim-newlines"."1.0.0" = self.buildNodePackage { + name = "trim-newlines-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + name = "trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."*" = + self.by-version."underscore"."1.8.3"; + by-version."underscore"."1.8.3" = self.buildNodePackage { + name = "underscore-1.8.3"; + version = "1.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + name = "underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."1.4.x" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = self.buildNodePackage { + name = "underscore-1.4.4"; + version = "1.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "underscore" = self.by-version."underscore"."1.4.4"; + by-spec."underscore"."1.5.x" = + self.by-version."underscore"."1.5.2"; + by-version."underscore"."1.5.2" = self.buildNodePackage { + name = "underscore-1.5.2"; + version = "1.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + name = "underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."1.6.x" = + self.by-version."underscore"."1.6.0"; + by-version."underscore"."1.6.0" = self.buildNodePackage { + name = "underscore-1.6.0"; + version = "1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + name = "underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore".">=1.1.3" = + self.by-version."underscore"."1.8.3"; + by-spec."underscore"."^1.8.3" = + self.by-version."underscore"."1.8.3"; + by-spec."underscore-contrib"."0.1.x" = + self.by-version."underscore-contrib"."0.1.4"; + by-version."underscore-contrib"."0.1.4" = self.buildNodePackage { + name = "underscore-contrib-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.1.4.tgz"; + name = "underscore-contrib-0.1.4.tgz"; + sha1 = "db40f37f2e66961d2e0326bf65fb76887a1ca1c6"; + }; + deps = { + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "underscore-contrib" = self.by-version."underscore-contrib"."0.1.4"; + by-spec."util-deprecate"."~1.0.1" = + self.by-version."util-deprecate"."1.0.2"; + by-version."util-deprecate"."1.0.2" = self.buildNodePackage { + name = "util-deprecate-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + name = "util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utml"."0.2.x" = + self.by-version."utml"."0.2.0"; + by-version."utml"."0.2.0" = self.buildNodePackage { + name = "utml-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; + name = "utml-0.2.0.tgz"; + sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + }; + deps = { + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "utml" = self.by-version."utml"."0.2.0"; + by-spec."validate-npm-package-license"."^3.0.1" = + self.by-version."validate-npm-package-license"."3.0.1"; + by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage { + name = "validate-npm-package-license-3.0.1"; + version = "3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + name = "validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + deps = { + "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2"; + "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."validator"."0.4.x" = + self.by-version."validator"."0.4.28"; + by-version."validator"."0.4.28" = self.buildNodePackage { + name = "validator-0.4.28"; + version = "0.4.28"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; + name = "validator-0.4.28.tgz"; + sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "validator" = self.by-version."validator"."0.4.28"; + by-spec."vows"."0.7.x" = + self.by-version."vows"."0.7.0"; + by-version."vows"."0.7.0" = self.buildNodePackage { + name = "vows-0.7.0"; + version = "0.7.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + name = "vows-0.7.0.tgz"; + sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + }; + deps = { + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."webfinger"."~0.4.2" = + self.by-version."webfinger"."0.4.2"; + by-version."webfinger"."0.4.2" = self.buildNodePackage { + name = "webfinger-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; + name = "webfinger-0.4.2.tgz"; + sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; + }; + deps = { + "step-0.0.6" = self.by-version."step"."0.0.6"; + "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "webfinger" = self.by-version."webfinger"."0.4.2"; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.6.3"; + by-version."websocket-driver"."0.6.3" = self.buildNodePackage { + name = "websocket-driver-0.6.3"; + version = "0.6.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.3.tgz"; + name = "websocket-driver-0.6.3.tgz"; + sha1 = "fd21911bb46dee34ad85bdbc5676bf9024ed087b"; + }; + deps = { + "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."websocket-extensions".">=0.1.1" = + self.by-version."websocket-extensions"."0.1.1"; + by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { + name = "websocket-extensions-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + name = "websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-version."wordwrap"."0.0.3" = self.buildNodePackage { + name = "wordwrap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + name = "wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."xml2js"."0.1.x" = + self.by-version."xml2js"."0.1.14"; + by-version."xml2js"."0.1.14" = self.buildNodePackage { + name = "xml2js-0.1.14"; + version = "0.1.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + name = "xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + deps = { + "sax-1.1.4" = self.by-version."sax"."1.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7e2ddb8176..994ea745a55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9451,6 +9451,8 @@ let psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; + pumpio = callPackage ../servers/web-apps/pump.io { }; + pyIRCt = builderDefsPackage (callPackage ../servers/xmpp/pyIRCt) {}; pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {}; From b13b9489ad23ab245e1d4a4f6cca8d97fab62a42 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 29 Nov 2015 21:28:29 +0000 Subject: [PATCH 052/498] pump.io service: init Pump.io runs its web server as a standalone service listening on 443. It's also possible to put the service behind a HTTP reverse proxy. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/pump.io.nix | 364 ++++++++++++++++++++ 3 files changed, 367 insertions(+) create mode 100644 nixos/modules/services/web-apps/pump.io.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2b40120641a..6ff95605d4b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -237,6 +237,7 @@ calibre-server = 213; heapster = 214; bepasty = 215; + pumpio = 216; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -451,6 +452,7 @@ xtreemfs = 212; calibre-server = 213; bepasty = 215; + pumpio = 216; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cf38f1c8f..9fc1d54bd84 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -401,6 +401,7 @@ ./services/ttys/agetty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix + ./services/web-apps/pump.io.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix new file mode 100644 index 00000000000..b7c64bc6940 --- /dev/null +++ b/nixos/modules/services/web-apps/pump.io.nix @@ -0,0 +1,364 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pumpio; + dataDir = "/var/lib/pump.io"; + user = "pumpio"; + + configOptions = { + driver = if cfg.driver == "disk" then null else cfg.driver; + params = ({ } // + (if cfg.driver == "disk" then { + dir = dataDir; + } else { }) // + (if cfg.driver == "mongodb" || cfg.driver == "redis" then { + host = cfg.dbHost; + port = cfg.dbPort; + dbname = cfg.dbName; + dbuser = cfg.dbUser; + dbpass = cfg.dbPassword; + } else { }) // + (if cfg.driver == "memcached" then { + host = cfg.dbHost; + port = cfg.dbPort; + } else { }) // + cfg.driverParams); + + secret = cfg.secret; + + address = cfg.address; + port = cfg.port; + + noweb = false; + urlPort = cfg.urlPort; + hostname = cfg.hostname; + favicon = cfg.favicon; + + site = cfg.site; + owner = cfg.owner; + ownerURL = cfg.ownerURL; + + key = cfg.sslKey; + cert = cfg.sslCert; + bounce = false; + + spamhost = cfg.spamHost; + spamclientid = cfg.spamClientId; + spamclientsecret = cfg.spamClientSecret; + + requireEmail = cfg.requireEmail; + smtpserver = cfg.smtpHost; + smtpport = cfg.smtpPort; + smtpuser = cfg.smtpUser; + smtppass = cfg.smtpPassword; + smtpusessl = cfg.smtpUseSSL; + smtpfrom = cfg.smtpFrom; + + nologger = false; + uploaddir = "${dataDir}/uploads"; + debugClient = false; + firehose = cfg.firehose; + disableRegistration = cfg.disableRegistration; + } // + (if cfg.port < 1024 then { + serverUser = user; # have pump.io listen then drop privileges + } else { }) // + cfg.extraConfig; + +in + +{ + options = { + + services.pumpio = { + + enable = mkEnableOption "Pump.io social streams server"; + + secret = mkOption { + type = types.str; + example = "my dog has fleas"; + description = '' + A session-generating secret, server-wide password. Warning: + this is stored in cleartext in the Nix store! + ''; + }; + + site = mkOption { + type = types.str; + example = "Awesome Sauce"; + description = "Name of the server"; + }; + + owner = mkOption { + type = types.str; + default = ""; + example = "Awesome Inc."; + description = "Name of owning entity, if you want to link to it."; + }; + + ownerURL = mkOption { + type = types.str; + default = ""; + example = "https://pump.io"; + description = "URL of owning entity, if you want to link to it."; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = '' + Web server listen address. + ''; + }; + + port = mkOption { + type = types.int; + default = 31337; + description = '' + Port to listen on. Defaults to 31337, which is suitable for + running behind a reverse proxy. For a standalone server, + use 443. + ''; + }; + + hostname = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The hostname of the server, used for generating + URLs. Defaults to "localhost" which doesn't do much for you. + ''; + }; + + urlPort = mkOption { + type = types.int; + default = 443; + description = '' + Port to use for generating URLs. This basically has to be + either 80 or 443 because the host-meta and Webfinger + protocols don't make any provision for HTTP/HTTPS servers + running on other ports. + ''; + }; + + favicon = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Local filesystem path to the favicon.ico file to use. This + will be served as "/favicon.ico" by the server. + ''; + }; + + sslKey = mkOption { + type = types.path; + example = "${dataDir}/myserver.key"; + default = ""; + description = '' + The path to the server certificate private key. The + certificate is required, but it can be self-signed. + ''; + }; + + sslCert = mkOption { + type = types.path; + example = "${dataDir}/myserver.crt"; + default = ""; + description = '' + The path to the server certificate. The certificate is + required, but it can be self-signed. + ''; + }; + + firehose = mkOption { + type = types.str; + default = "ofirehose.com"; + description = '' + Firehose host running the ofirehose software. Defaults to + "ofirehose.com". Public notices will be ping this firehose + server and from there go out to search engines and the + world. If you want to disconnect from the public web, set + this to something falsy. + ''; + }; + + disableRegistration = mkOption { + type = types.bool; + default = false; + description = '' + Disables registering new users on the site through the Web + or the API. + ''; + }; + + requireEmail = mkOption { + type = types.bool; + default = false; + description = "Require an e-mail address to register."; + }; + + extraConfig = mkOption { + default = { }; + description = '' + Extra configuration options which are serialized to json and added + to the pump.io.json config file. + ''; + }; + + driver = mkOption { + type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ]; + default = "mongodb"; + description = "Type of database. Corresponds to a nodejs databank driver."; + }; + + driverParams = mkOption { + default = { }; + description = "Extra parameters for the driver."; + }; + + dbHost = mkOption { + type = types.str; + default = "localhost"; + description = "The database host to connect to."; + }; + + dbPort = mkOption { + type = types.int; + default = 27017; + description = "The port that the database is listening on."; + }; + + dbName = mkOption { + type = types.str; + default = "pumpio"; + description = "The name of the database to use."; + }; + + dbUser = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The username. Defaults to null, meaning no authentication. + ''; + }; + + dbPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The password corresponding to dbUser. Warning: this is + stored in cleartext in the Nix store! + ''; + }; + + smtpHost = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost"; + description = '' + Server to use for sending transactional email. If it's not + set up, no email is sent and features like password recovery + and email notification won't work. + ''; + }; + + smtpPort = mkOption { + type = types.int; + default = 25; + description = '' + Port to connect to on SMTP server. + ''; + }; + + smtpUser = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Username to use to connect to SMTP server. Might not be + necessary for some servers. + ''; + }; + + smtpPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password to use to connect to SMTP server. Might not be + necessary for some servers. Warning: this is stored in + cleartext in the Nix store! + ''; + }; + + smtpUseSSL = mkOption { + type = types.bool; + default = false; + description = '' + Only use SSL with the SMTP server. By default, a SSL + connection is negotiated using TLS. You may need to change + the smtpPort value if you set this. + ''; + }; + + smtpFrom = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Email address to use in the "From:" header of outgoing + notifications. Defaults to 'no-reply@' plus the site + hostname. + ''; + }; + + spamHost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host running activityspam software to use to test updates + for spam. + ''; + }; + spamClientId = mkOption { + type = types.nullOr types.str; + default = null; + description = "OAuth pair for spam server."; + }; + spamClientSecret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + OAuth pair for spam server. Warning: this is + stored in cleartext in the Nix store! + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + systemd.services."pump.io" = + { description = "pump.io social network stream server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json"; + serviceConfig.User = if cfg.port < 1024 then "root" else user; + serviceConfig.Group = user; + }; + + environment.etc."pump.io.json" = { + mode = "0440"; + gid = config.ids.gids.pumpio; + text = builtins.toJSON configOptions; + }; + + users.extraGroups.pumpio.gid = config.ids.gids.pumpio; + users.extraUsers.pumpio = { + group = "pumpio"; + uid = config.ids.uids.pumpio; + description = "Pump.io user"; + home = dataDir; + createHome = true; + }; + }; +} From 2198381235e3502c9c989df0b211624ef891fa47 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 30 Nov 2015 18:19:42 +0000 Subject: [PATCH 053/498] nixos tests: pump.io: init --- nixos/release.nix | 1 + nixos/tests/pump.io.nix | 94 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 nixos/tests/pump.io.nix diff --git a/nixos/release.nix b/nixos/release.nix index f0df3fe3e1e..bf0dc2379b5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -283,6 +283,7 @@ in rec { tests.peerflix = callTest tests/peerflix.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; + tests.pumpio = callTest tests/pump.io.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.sddm = callTest tests/sddm.nix {}; diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix new file mode 100644 index 00000000000..89fa23c3336 --- /dev/null +++ b/nixos/tests/pump.io.nix @@ -0,0 +1,94 @@ +# This test runs pump.io with mongodb, listing on port 443. + +import ./make-test.nix ({ pkgs, ...} : let + snakeOilKey = '' + -----BEGIN PRIVATE KEY----- + MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqVemio78R41Tz + MnR2zFD/wFT0iScOpFkuytNmuPf28FLaa9wSBWmuAGbEi7wBIfw8/bUqFBTQp2G1 + m1cmcCKxhmvvOkGs89eM131s1lW/bXU3zYso4e7724kHwU65jRlQs6cFWIlmW7V5 + 3HQobP05dy+zPpujPPSlOQ0qYViR1s+RgZI8r0wS2ZDsliNtQwBLJSIvX6XVnXLo + F/HmF4/ySJ9pL2AxQXCwZE8SfCzHpArs9COIqTaAuwB79kxWSFQJewmab74BXiM6 + 9FMCtHON24Pl7OR9sRJHH8rMEzUumppmUeCNEzABjzQQ7svR18cmbzRWetp0tT9Y + 7rj6URHHAgMBAAECggEAGmbCldDnlrAzxJY3cwpsK5f2EwkHIr/aiuQpLCzTUlUh + onVBYRGxtaSeSSyXcV2BKTrxz5nZOBYZkPqI4Y5T8kwxgpz2/QW2jUABUtNN6yPe + HU4gma+bSTJX5PnTZ/M0z0tpQezdLx5b3I2M+48ZGMUegZvcp8qU6N8U6VK5VbFD + DMTGL4b+Kc9HScRkCJjU3FfQcqf9Ml5w9jzHSeHImYEDrG0nX8N8EImRCBXbgxCl + 5XT1h6LFUGdr+N6n2w56+6l8OZZVmwj1NdF6NJybUQl4Y7b0niA+5czzjRt/YUjZ + HW0fXmx3XlbYGWYdMdS+VaIW6pkUpm8kZkqjngqLwQKBgQDfhbFQmg9lsJQ8/dQZ + WzRNsozHKWkQiZbW5sXBWygJbAB3Hc8gvQkuZe9TVyF99cznRj6ro6pGZjP0rTdY + 3ACTL+ygRArcIR6VsJCIr6nPvBLpOoNb8TQeKPmHC2gnSP9zaT/K2lldYISKNaYQ + 0seB2gvZhIgMgWtZtmb3jdgl9wKBgQDDFdknXgvFgB+y96//9wTu2WWuE5yQ5yB7 + utAcHNO9rx5X1tJqxymYh+iE8HUN25By+96SpNMQFI+0wNGVB00YWNBKtyepimWN + EUCojTy+MIXIjrLcvviEePsI4TPWYf8XtZeiYtcczYrt/wPQUYaDb8LBRfpIfmhr + rCGW93s+sQKBgEDOKTeeQyKPjJsWWL01RTfVsZ04s155FcOeyu0heb0plAT1Ho12 + YUgTg8zc8Tfs4QiYxCjNXdvlW+Dvq6FWv8/s0CUzNRbXf1+U/oKys4AoHi+CqH0q + tJqd9KKjuwHQ10dl13n/znMVPbg4j7pG8lMCnfblxvAhQbeT+8yAUo/HAoGBAL3t + /n4KXNGK3NHDvXEp0H6t3wWsiEi3DPQJO+Wy1x8caCFCv5c/kaqz3tfWt0+njSm1 + N8tzdx13tzVWaHV8Jz3l8dxcFtxEJnxB6L5wy0urOAS7kT3DG3b1xgmuH2a//7fY + jumE60NahcER/2eIh7pdS7IZbAO6NfVmH0m4Zh/xAoGAbquh60sAfLC/1O2/4Xom + PHS7z2+TNpwu4ou3nspxfigNQcTWzzzTVFLnaTPg+HKbLRXSWysjssmmj5u3lCyc + S2M9xuhApa9CrN/udz4gEojRVsTla/gyLifIZ3CtTn2QEQiIJEMxM+59KAlkgUBo + 9BeZ03xTaEZfhVZ9bEN30Ak= + -----END PRIVATE KEY----- + ''; + + snakeOilCert = '' + -----BEGIN CERTIFICATE----- + MIICvjCCAaagAwIBAgIJANhA6+PPhomZMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV + BAMMDGIwOTM0YWMwYWZkNTAeFw0xNTExMzAxNzQ3MzVaFw0yNTExMjcxNzQ3MzVa + MBcxFTATBgNVBAMMDGIwOTM0YWMwYWZkNTCCASIwDQYJKoZIhvcNAQEBBQADggEP + ADCCAQoCggEBAKpV6aKjvxHjVPMydHbMUP/AVPSJJw6kWS7K02a49/bwUtpr3BIF + aa4AZsSLvAEh/Dz9tSoUFNCnYbWbVyZwIrGGa+86Qazz14zXfWzWVb9tdTfNiyjh + 7vvbiQfBTrmNGVCzpwVYiWZbtXncdChs/Tl3L7M+m6M89KU5DSphWJHWz5GBkjyv + TBLZkOyWI21DAEslIi9fpdWdcugX8eYXj/JIn2kvYDFBcLBkTxJ8LMekCuz0I4ip + NoC7AHv2TFZIVAl7CZpvvgFeIzr0UwK0c43bg+Xs5H2xEkcfyswTNS6ammZR4I0T + MAGPNBDuy9HXxyZvNFZ62nS1P1juuPpREccCAwEAAaMNMAswCQYDVR0TBAIwADAN + BgkqhkiG9w0BAQsFAAOCAQEAd2w9rxi6qF9WV8L3rHnTE7uu0ldtdgJlCASx6ouj + TleOnjfEg+kH8r8UbmRV5vsTDn1Qp5JGDYxfytRUQwLb1zTLde0xotx37E3LY8Wr + sD6Al4t8sHywB/hc5dy29TgG0iyG8LKZrkwytLvDZ814W3OwpN2rpEz6pdizdHNn + jsoDEngZiDHvLjIyE0cDkFXkeYMGXOnBUeOcu4nfu4C5eKs3nXGGAcNDbDRIuLoE + BZExUBY+YSs6JBvh5tvRqLVW0Dz0akEcjb/jhwS2LmDip8Pdoxx4Q1jPKEu38zrr + Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== + -----END CERTIFICATE----- + ''; + + makePump = { opts ? { } }: + { + enable = true; + sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; + sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; + secret = "test"; + site = "test"; + } // opts; + +in { + name = "pumpio"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rvl ]; + }; + + nodes = { + one = + { config, pkgs, ... }: + { + services = { + pumpio = makePump { opts = { + port = 443; + }; }; + mongodb.enable = true; + mongodb.extraConfig = '' + nojournal = true + ''; + }; + systemd.services.mongodb.unitConfig.Before = "pump.io.service"; + systemd.services.mongodb.unitConfig.RequiredBy = "pump.io.service"; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("pump.io.service"); + $one->waitUntilSucceeds("curl -k https://localhost"); + ''; +}) From b89514eced6d32203982c54e0ad8c2f83dbca900 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Dec 2015 15:04:14 +0100 Subject: [PATCH 054/498] fetchgit: follow up to 2cf7069b7da368326b51520536ac0f1020157f7a If "fetcher" is a string, then Nix will execute it with bash already, so the additional bash argument in that string was redundant and apparently causes trouble on non-Linux platforms. Hopefully fixes https://github.com/NixOS/nixpkgs/issues/11496. --- pkgs/build-support/fetchgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index c73ee193519..127693d42f2 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = "${stdenv.shell} ${./nix-prefetch-git}"; + fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; outputHashAlgo = if sha256 == "" then "md5" else "sha256"; From 59c130a690df226acba9862a268f76926838df6f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 5 Dec 2015 14:46:08 +0100 Subject: [PATCH 055/498] openttd: 1.5.2 -> 1.5.3 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8b9c412eaac..97b6be9be2e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0a4zh66vvkipdrm45gql4mlqpf26mn4m6pl86f02cd1fap58xrk0"; + sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; From 0c2259629d8a6e28c1552a8554cdd013a97ab87c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Dec 2015 09:27:19 -0600 Subject: [PATCH 056/498] add elpa-packages.nix --- .../editors/emacs-modes/elpa-packages.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/elpa-packages.nix diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix new file mode 100644 index 00000000000..3cf37c26280 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -0,0 +1,42 @@ +pkgs: with pkgs; + +let + + inherit (stdenv.lib) makeScope mapAttrs; + + json = builtins.readFile ./elpa-packages.json; + manifest = builtins.fromJSON json; + + mkPackage = self: name: recipe: + let drv = + { elpaBuild, stdenv, fetchurl }: + let fetch = { inherit fetchurl; }."${recipe.fetch.tag}" + or (abort "emacs-${name}: unknown fetcher '${recipe.fetch.tag}'"); + args = builtins.removeAttrs recipe.fetch [ "tag" ]; + src = fetch args; + in elpaBuild { + pname = name; + inherit (recipe) version; + inherit src; + deps = + let lookupDep = d: + self."${d}" or (abort "emacs-${name}: missing dependency ${d}"); + in map lookupDep recipe.deps; + meta = { + homepage = "http://elpa.gnu.org/packages/${name}.html"; + license = stdenv.lib.licenses.free; + }; + }; + in self.callPackage drv {}; + + packages = self: + let + elpaPackages = mapAttrs (mkPackage self) manifest; + + elpaBuild = import ../../../build-support/emacs/melpa.nix { + inherit (pkgs) lib stdenv fetchurl texinfo; + inherit (self) emacs; + }; + in elpaPackages // { inherit elpaBuild elpaPackages; }; + +in makeScope pkgs.newScope packages From 8498f9d46b52062a3ad9957a5d9188ea51e6ae2c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Dec 2015 09:28:11 -0600 Subject: [PATCH 057/498] elpa-packages 2015-12-06 --- .../editors/emacs-modes/elpa-packages.json | 1337 +++++++++++++++++ 1 file changed, 1337 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/elpa-packages.json diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.json b/pkgs/applications/editors/emacs-modes/elpa-packages.json new file mode 100644 index 00000000000..0572dca56be --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.json @@ -0,0 +1,1337 @@ +{ + "stream": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/stream-2.1.0.el", + "sha256": "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y" + }, + "version": "2.1.0", + "deps": [ + "emacs" + ] + }, + "load-dir": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/load-dir-0.0.3.el", + "sha256": "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32" + }, + "version": "0.0.3", + "deps": [] + }, + "w3": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/w3-4.0.49.tar", + "sha256": "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb" + }, + "version": "4.0.49", + "deps": [] + }, + "diff-hl": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/diff-hl-1.8.1.tar", + "sha256": "09yqa71xmkikkzddg9f6ah92444wwf14aial9fxv2cxqavisdj64" + }, + "version": "1.8.1", + "deps": [ + "cl-lib" + ] + }, + "sml-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sml-mode-6.7.el", + "sha256": "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x" + }, + "version": "6.7", + "deps": [] + }, + "gnugo": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/gnugo-3.0.0.tar", + "sha256": "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x" + }, + "version": "3.0.0", + "deps": [ + "ascii-art-to-unicode", + "cl-lib", + "xpm" + ] + }, + "python": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/python-0.25.1.el", + "sha256": "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd" + }, + "version": "0.25.1", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "vlf": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/vlf-1.7.tar", + "sha256": "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r" + }, + "version": "1.7", + "deps": [] + }, + "minimap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/minimap-1.2.el", + "sha256": "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8" + }, + "version": "1.2", + "deps": [] + }, + "load-relative": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/load-relative-1.2.el", + "sha256": "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw" + }, + "version": "1.2", + "deps": [] + }, + "quarter-plane": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/quarter-plane-0.1.el", + "sha256": "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm" + }, + "version": "0.1", + "deps": [] + }, + "context-coloring": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/context-coloring-7.2.0.el", + "sha256": "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn" + }, + "version": "7.2.0", + "deps": [ + "emacs", + "js2-mode" + ] + }, + "svg-clock": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/svg-clock-0.5.el", + "sha256": "1i77c7nyqcwc6b6n7vdh95xbmwv5kpdds6j7pklp4c9vbvm8axgp" + }, + "version": "0.5", + "deps": [ + "emacs", + "svg" + ] + }, + "math-symbol-lists": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el", + "sha256": "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn" + }, + "version": "1.0", + "deps": [] + }, + "osc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/osc-0.1.el", + "sha256": "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb" + }, + "version": "0.1", + "deps": [] + }, + "electric-spacing": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/electric-spacing-5.0.el", + "sha256": "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv" + }, + "version": "5.0", + "deps": [] + }, + "exwm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/exwm-0.1.tar", + "sha256": "18w9a37v8lyyjj8ll2f5mw8fw14g54b887cflzv5d576k5f606f5" + }, + "version": "0.1", + "deps": [ + "xelb" + ] + }, + "ada-ref-man": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ada-ref-man-2012.0.tar", + "sha256": "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8" + }, + "version": "2012.0", + "deps": [] + }, + "landmark": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/landmark-1.0.el", + "sha256": "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4" + }, + "version": "1.0", + "deps": [] + }, + "rudel": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rudel-0.3.tar", + "sha256": "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1" + }, + "version": "0.3", + "deps": [] + }, + "tiny": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/tiny-0.1.tar", + "sha256": "04iyidzjgnm4ka575wxqdak19h8j4dlni2ahf0bkq1q9by79xq1q" + }, + "version": "0.1", + "deps": [] + }, + "coffee-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el", + "sha256": "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz" + }, + "version": "0.4.1.1", + "deps": [] + }, + "sisu-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el", + "sha256": "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r" + }, + "version": "3.0.3", + "deps": [] + }, + "lmc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/lmc-1.3.el", + "sha256": "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p" + }, + "version": "1.3", + "deps": [] + }, + "temp-buffer-browse": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/temp-buffer-browse-1.4.el", + "sha256": "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw" + }, + "version": "1.4", + "deps": [] + }, + "org": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/org-20151123.tar", + "sha256": "13ybzjg6k61paldfln6isc6149hvilwsgsnhyirig42bz1z0vjbb" + }, + "version": "20151123", + "deps": [] + }, + "bug-hunter": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/bug-hunter-1.0.1.el", + "sha256": "0c0pg542y09c1k25dxk2062pj3cj12i73kqxbpq0m6af0qm7wy9d" + }, + "version": "1.0.1", + "deps": [ + "cl-lib", + "seq" + ] + }, + "test-simple": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/test-simple-1.1.el", + "sha256": "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw" + }, + "version": "1.1", + "deps": [ + "cl-lib" + ] + }, + "notes-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/notes-mode-1.30.tar", + "sha256": "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6" + }, + "version": "1.30", + "deps": [] + }, + "nlinum": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nlinum-1.6.el", + "sha256": "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw" + }, + "version": "1.6", + "deps": [] + }, + "sokoban": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sokoban-1.4.tar", + "sha256": "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1" + }, + "version": "1.4", + "deps": [] + }, + "tNFA": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/tNFA-0.1.1.el", + "sha256": "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds" + }, + "version": "0.1.1", + "deps": [ + "queue" + ] + }, + "js2-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/js2-mode-20150909.tar", + "sha256": "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h" + }, + "version": "20150909", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "other-frame-window": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/other-frame-window-1.0.2.el", + "sha256": "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d" + }, + "version": "1.0.2", + "deps": [ + "emacs" + ] + }, + "flylisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/flylisp-0.2.el", + "sha256": "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6" + }, + "version": "0.2", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "yasnippet": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/yasnippet-0.8.0.tar", + "sha256": "1syb9sc6xbw4vjhaix8b41lbm5zq6myrljl4r72yi6ndj5z9bmpr" + }, + "version": "0.8.0", + "deps": [] + }, + "cl-lib": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/cl-lib-0.5.el", + "sha256": "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994" + }, + "version": "0.5", + "deps": [] + }, + "dts-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dts-mode-0.1.0.el", + "sha256": "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq" + }, + "version": "0.1.0", + "deps": [] + }, + "djvu": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/djvu-0.5.el", + "sha256": "1wpyv4ismfsz5hfaj75j3h3nni1mnk33czhw3rd45cf32a2zkqsj" + }, + "version": "0.5", + "deps": [] + }, + "javaimp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/javaimp-0.6.el", + "sha256": "00a37jv9wbzy521a15vk7a66rsf463zzr57adc8ii2m4kcyldpqh" + }, + "version": "0.6", + "deps": [] + }, + "loc-changes": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/loc-changes-1.2.el", + "sha256": "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3" + }, + "version": "1.2", + "deps": [] + }, + "scroll-restore": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/scroll-restore-1.0.el", + "sha256": "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn" + }, + "version": "1.0", + "deps": [] + }, + "web-server": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/web-server-0.1.1.tar", + "sha256": "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n" + }, + "version": "0.1.1", + "deps": [ + "emacs" + ] + }, + "debbugs": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/debbugs-0.8.tar", + "sha256": "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5" + }, + "version": "0.8", + "deps": [] + }, + "on-screen": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/on-screen-1.3.2.el", + "sha256": "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv" + }, + "version": "1.3.2", + "deps": [ + "cl-lib" + ] + }, + "pabbrev": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/pabbrev-4.2.1.el", + "sha256": "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh" + }, + "version": "4.2.1", + "deps": [] + }, + "fsm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/fsm-0.2.el", + "sha256": "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy" + }, + "version": "0.2", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "jgraph-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/jgraph-mode-1.1.el", + "sha256": "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l" + }, + "version": "1.1", + "deps": [ + "cl-lib" + ] + }, + "wpuzzle": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wpuzzle-1.1.el", + "sha256": "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj" + }, + "version": "1.1", + "deps": [] + }, + "darkroom": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/darkroom-0.1.el", + "sha256": "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "let-alist": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/let-alist-1.0.4.el", + "sha256": "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x" + }, + "version": "1.0.4", + "deps": [] + }, + "wconf": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wconf-0.2.0.el", + "sha256": "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk" + }, + "version": "0.2.0", + "deps": [ + "emacs" + ] + }, + "ntlm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ntlm-2.0.0.el", + "sha256": "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4" + }, + "version": "2.0.0", + "deps": [] + }, + "cl-generic": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/cl-generic-0.2.el", + "sha256": "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3" + }, + "version": "0.2", + "deps": [] + }, + "undo-tree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/undo-tree-0.6.5.el", + "sha256": "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37" + }, + "version": "0.6.5", + "deps": [] + }, + "muse": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/muse-3.20.tar", + "sha256": "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9" + }, + "version": "3.20", + "deps": [] + }, + "aumix-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/aumix-mode-7.el", + "sha256": "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv" + }, + "version": "7", + "deps": [] + }, + "avy": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/avy-0.3.0.tar", + "sha256": "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458" + }, + "version": "0.3.0", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "markchars": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/markchars-0.2.0.el", + "sha256": "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv" + }, + "version": "0.2.0", + "deps": [] + }, + "rich-minority": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rich-minority-1.0.1.el", + "sha256": "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc" + }, + "version": "1.0.1", + "deps": [ + "cl-lib" + ] + }, + "hydra": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/hydra-0.13.3.tar", + "sha256": "1il0maxkxm2nxwz6y6v85zhf6a8f52gfq51h1filcnlzg10b5arm" + }, + "version": "0.13.3", + "deps": [ + "cl-lib" + ] + }, + "dismal": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dismal-1.5.tar", + "sha256": "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476" + }, + "version": "1.5", + "deps": [ + "cl-lib" + ] + }, + "xclip": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xclip-1.3.el", + "sha256": "1zlqr4sp8588sjga5c9b4prnsbpv3lr2wv8sih2p0s5qmjghc947" + }, + "version": "1.3", + "deps": [] + }, + "nameless": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nameless-0.5.1.el", + "sha256": "0vv4zpqb56w9xy9wljchwilcwpw7zdmqrwfwffxp0pgbhf4w41y9" + }, + "version": "0.5.1", + "deps": [ + "emacs" + ] + }, + "sotlisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sotlisp-1.4.1.el", + "sha256": "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j" + }, + "version": "1.4.1", + "deps": [ + "emacs" + ] + }, + "register-list": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/register-list-0.1.el", + "sha256": "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh" + }, + "version": "0.1", + "deps": [] + }, + "f90-interface-browser": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/f90-interface-browser-1.1.el", + "sha256": "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is" + }, + "version": "1.1", + "deps": [] + }, + "ediprolog": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ediprolog-1.1.el", + "sha256": "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd" + }, + "version": "1.1", + "deps": [] + }, + "queue": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/queue-0.1.1.el", + "sha256": "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391" + }, + "version": "0.1.1", + "deps": [] + }, + "iterators": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/iterators-0.1.el", + "sha256": "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4" + }, + "version": "0.1", + "deps": [ + "emacs" + ] + }, + "all": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/all-1.0.el", + "sha256": "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3" + }, + "version": "1.0", + "deps": [] + }, + "docbook": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/docbook-0.1.el", + "sha256": "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6" + }, + "version": "0.1", + "deps": [] + }, + "dict-tree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dict-tree-0.12.8.el", + "sha256": "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5" + }, + "version": "0.12.8", + "deps": [ + "heap", + "tNFA", + "trie" + ] + }, + "memory-usage": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/memory-usage-0.2.el", + "sha256": "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj" + }, + "version": "0.2", + "deps": [] + }, + "ggtags": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ggtags-0.8.10.el", + "sha256": "0bigf87idd2rh40akyjiy1qvym6y3hvvx6khyb233b231s400aj9" + }, + "version": "0.8.10", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "soap-client": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/soap-client-3.0.2.tar", + "sha256": "0yx7lnag6fqrnm3a4j77w1lq63izn43sms0n3d4504yr3p826sci" + }, + "version": "3.0.2", + "deps": [ + "cl-lib" + ] + }, + "ack": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ack-1.5.tar", + "sha256": "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r" + }, + "version": "1.5", + "deps": [] + }, + "wisi": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wisi-1.1.1.tar", + "sha256": "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r" + }, + "version": "1.1.1", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "beacon": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/beacon-0.5.1.el", + "sha256": "1xzypqprlx23kxlkc1waranyq378ipxr8i6fv6hnhg4ys5j8ksj4" + }, + "version": "0.5.1", + "deps": [ + "seq" + ] + }, + "names": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/names-20151201.0.tar", + "sha256": "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d" + }, + "version": "20151201.0", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "dbus-codegen": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dbus-codegen-0.1.el", + "sha256": "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "ztree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ztree-1.0.2.tar", + "sha256": "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665" + }, + "version": "1.0.2", + "deps": [] + }, + "heap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/heap-0.3.el", + "sha256": "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6" + }, + "version": "0.3", + "deps": [] + }, + "uni-confusables": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/uni-confusables-0.1.tar", + "sha256": "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp" + }, + "version": "0.1", + "deps": [] + }, + "enwc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/enwc-1.0.tar", + "sha256": "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y" + }, + "version": "1.0", + "deps": [] + }, + "ascii-art-to-unicode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el", + "sha256": "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv" + }, + "version": "1.9", + "deps": [] + }, + "company": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-0.8.12.tar", + "sha256": "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx" + }, + "version": "0.8.12", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "seq": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/seq-1.11.el", + "sha256": "1qpam4cxpy6x6gibln21v29mif71kifyvdfymjsidlnjqqnvdk1h" + }, + "version": "1.11", + "deps": [] + }, + "company-statistics": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-statistics-0.2.2.tar", + "sha256": "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73" + }, + "version": "0.2.2", + "deps": [ + "company", + "emacs" + ] + }, + "metar": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/metar-0.1.el", + "sha256": "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "caps-lock": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/caps-lock-1.0.el", + "sha256": "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva" + }, + "version": "1.0", + "deps": [] + }, + "wcheck-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wcheck-mode-2014.6.21.el", + "sha256": "0qgyj9mrg4b4rkbm0sdhysrzqr1adri4xpjh33zkpy70vln1qnc7" + }, + "version": "2014.6.21", + "deps": [] + }, + "ahungry-theme": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ahungry-theme-1.0.12.tar", + "sha256": "0a6mlxka1b7vja4wxd8gvfhfk5i1jdj3a851c7dn34hz1lkgvnx8" + }, + "version": "1.0.12", + "deps": [ + "emacs" + ] + }, + "el-search": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/el-search-0.1.1.el", + "sha256": "1q5nscxajqc2qvqksh2glq106749bx6cnz97ysfjh2i78vps4z36" + }, + "version": "0.1.1", + "deps": [ + "emacs" + ] + }, + "company-math": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-math-1.0.1.el", + "sha256": "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck" + }, + "version": "1.0.1", + "deps": [ + "company", + "math-symbol-lists" + ] + }, + "swiper": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/swiper-0.5.1.tar", + "sha256": "06kd6r90fnjz3lapm52pgsx4dhnd95mkzq9y4khkzqny59h0vmm6" + }, + "version": "0.5.1", + "deps": [ + "emacs" + ] + }, + "eldoc-eval": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/eldoc-eval-0.1.el", + "sha256": "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19" + }, + "version": "0.1", + "deps": [] + }, + "ada-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar", + "sha256": "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6" + }, + "version": "5.1.8", + "deps": [ + "cl-lib", + "emacs", + "wisi" + ] + }, + "svg": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/svg-0.1.el", + "sha256": "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5" + }, + "version": "0.1", + "deps": [ + "emacs" + ] + }, + "omn-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/omn-mode-1.2.el", + "sha256": "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742" + }, + "version": "1.2", + "deps": [] + }, + "trie": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/trie-0.2.6.el", + "sha256": "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii" + }, + "version": "0.2.6", + "deps": [ + "heap", + "tNFA" + ] + }, + "transcribe": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/transcribe-0.5.0.el", + "sha256": "1wxfv96sjcxins8cyqijsb16fc3n0m13kvaw0hjam8x91wamcbxq" + }, + "version": "0.5.0", + "deps": [] + }, + "websocket": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/websocket-1.5.tar", + "sha256": "0plgc8an229cqbghrxd6wh73b081dc17fx1r940dqhgi284pcjsy" + }, + "version": "1.5", + "deps": [] + }, + "aggressive-indent": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/aggressive-indent-1.4.el", + "sha256": "0qdpvdzmw4hq2g8krx93fbb352nkg731p7v82zhqw76y79khdpka" + }, + "version": "1.4", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "xpm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xpm-1.0.3.tar", + "sha256": "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4" + }, + "version": "1.0.3", + "deps": [] + }, + "oauth2": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/oauth2-0.10.el", + "sha256": "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna" + }, + "version": "0.10", + "deps": [] + }, + "spinner": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/spinner-1.4.el", + "sha256": "0j4x8hbnhda83yyb31mm9b014pfb81gdfsr026rhn8ls3y163dbf" + }, + "version": "1.4", + "deps": [] + }, + "ergoemacs-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar", + "sha256": "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90" + }, + "version": "5.14.7.3", + "deps": [ + "emacs", + "undo-tree" + ] + }, + "minibuffer-line": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/minibuffer-line-0.1.el", + "sha256": "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil" + }, + "version": "0.1", + "deps": [] + }, + "rainbow-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rainbow-mode-0.12.el", + "sha256": "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04" + }, + "version": "0.12", + "deps": [] + }, + "csv-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/csv-mode-1.5.el", + "sha256": "1dmc6brb6m9s29wsr6giwpf77yindfq47344l9jr31hqgg82x1xc" + }, + "version": "1.5", + "deps": [] + }, + "adjust-parens": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/adjust-parens-3.0.tar", + "sha256": "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg" + }, + "version": "3.0", + "deps": [] + }, + "crisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/crisp-1.3.4.el", + "sha256": "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i" + }, + "version": "1.3.4", + "deps": [] + }, + "poker": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/poker-0.1.el", + "sha256": "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0" + }, + "version": "0.1", + "deps": [] + }, + "auto-overlays": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/auto-overlays-0.10.9.tar", + "sha256": "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p" + }, + "version": "0.10.9", + "deps": [] + }, + "pinentry": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/pinentry-0.1.el", + "sha256": "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d" + }, + "version": "0.1", + "deps": [] + }, + "adaptive-wrap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/adaptive-wrap-0.5.el", + "sha256": "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy" + }, + "version": "0.5", + "deps": [] + }, + "xelb": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xelb-0.4.tar", + "sha256": "1m3wmlzcnbv1akncdaakfy4xmxyjnfb6yl1nfahwf4lfxlsvnwzd" + }, + "version": "0.4", + "deps": [ + "cl-generic", + "emacs" + ] + }, + "num3-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/num3-mode-1.2.el", + "sha256": "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8" + }, + "version": "1.2", + "deps": [] + }, + "gnorb": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/gnorb-1.1.1.tar", + "sha256": "1ni2gcnnpdm9pi3y9jap88nic1k0viv865w413xarw6w0jjpdpxa" + }, + "version": "1.1.1", + "deps": [ + "cl-lib" + ] + }, + "auctex": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/auctex-11.89.tar", + "sha256": "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5" + }, + "version": "11.89", + "deps": [] + }, + "dash": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dash-2.12.0.tar", + "sha256": "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05" + }, + "version": "2.12.0", + "deps": [] + }, + "windresize": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/windresize-0.1.el", + "sha256": "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x" + }, + "version": "0.1", + "deps": [] + }, + "timerfunctions": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/timerfunctions-1.4.2.el", + "sha256": "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5" + }, + "version": "1.4.2", + "deps": [ + "cl-lib" + ] + }, + "chess": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/chess-2.0.4.tar", + "sha256": "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js" + }, + "version": "2.0.4", + "deps": [ + "cl-lib" + ] + }, + "ace-window": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ace-window-0.9.0.el", + "sha256": "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3" + }, + "version": "0.9.0", + "deps": [ + "avy" + ] + }, + "shen-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/shen-mode-0.1.tar", + "sha256": "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz" + }, + "version": "0.1", + "deps": [] + }, + "easy-kill": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/easy-kill-0.9.3.tar", + "sha256": "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb" + }, + "version": "0.9.3", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "jumpc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/jumpc-3.0.el", + "sha256": "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a" + }, + "version": "3.0", + "deps": [] + }, + "epoch-view": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/epoch-view-0.0.1.el", + "sha256": "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx" + }, + "version": "0.0.1", + "deps": [] + }, + "midi-kbd": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/midi-kbd-0.2.el", + "sha256": "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh" + }, + "version": "0.2", + "deps": [ + "emacs" + ] + }, + "nhexl-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nhexl-mode-0.1.el", + "sha256": "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j" + }, + "version": "0.1", + "deps": [] + }, + "lex": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/lex-1.1.tar", + "sha256": "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7" + }, + "version": "1.1", + "deps": [] + }, + "ioccur": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ioccur-2.4.el", + "sha256": "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9" + }, + "version": "2.4", + "deps": [] + } +} \ No newline at end of file From 63eb6fdd8a07731d747ca78e22fd65fc06228529 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 22 Aug 2015 21:09:21 -0500 Subject: [PATCH 058/498] fetchsvn: correctly handle trailing slashes `splitString` does not split on trailing separators. --- pkgs/build-support/fetchsvn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 228a5eaa580..90dc13439a0 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -8,7 +8,7 @@ let snd = l: head (tail l); trd = l: head (tail (tail l)); path_ = reverseList (splitString "/" url); - path = if head path_ == "" then tail path_ else path_; + path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); in # ../repo/trunk -> repo if fst path == "trunk" then snd path From 32c0069b79ba6e8851032034a863b1af73dd6fbc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Dec 2015 11:49:39 -0600 Subject: [PATCH 059/498] add elpaPackages top-level attribute --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7e2ddb8176..8f3821e2f4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11622,6 +11622,10 @@ let emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); + elpaPackages = + let imported = import ../applications/editors/emacs-modes/elpa-packages.nix pkgs; + in recurseIntoAttrs (imported.override (super: self: { inherit emacs; })); + emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { }; emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; }; From 07a003102948d5af2d8781bf4fe85d306d2ab448 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Apr 2015 10:09:28 -0500 Subject: [PATCH 060/498] melpaBuild: add unpackCmd for single-file packages Emacs packages are commonly distributed as single .el files. This unpackCmd handles them correctly and sets up sourceRoot. Other sources are treated in the default manner. --- pkgs/build-support/emacs/generic.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 6fd630b13f4..d41f90ebd05 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -29,6 +29,19 @@ in stdenv.mkDerivation ({ name = "emacs-${pname}${optionalString (version != null) "-${version}"}"; + unpackCmd = '' + case "$curSrc" in + *.el) + cp $curSrc $pname.el + chmod +w $pname.el + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; propagatedBuildInputs = packageRequires; propagatedUserEnvPkgs = packageRequires; From 038c7a60a1a9f9fd0c79e57d8b797a1415814eba Mon Sep 17 00:00:00 2001 From: Pamelloes Date: Sun, 6 Dec 2015 12:34:06 -0600 Subject: [PATCH 061/498] Fix trollius buildon sandboxed pure darwin Skipped six tests that fail because of sandbox restrictions (namely the three variants of test_read_pty_output and test_write_pty). --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c62715593c7..d25a3d1dfda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21791,6 +21791,8 @@ in modules // { sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py + sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|" tests/test_events.py + sed -i -e "s|test_write_pty|skip_test_write_pty|" tests/test_events.py sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py From bf0ed5e93a3362a7bd77f6ca1321ed865e5a43aa Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 6 Dec 2015 19:43:25 +0100 Subject: [PATCH 062/498] added kgocode --- pkgs/applications/misc/kgocode/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/kgocode/default.nix diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix new file mode 100644 index 00000000000..5e72b02045c --- /dev/null +++ b/pkgs/applications/misc/kgocode/default.nix @@ -0,0 +1,21 @@ +{ fetchgit, stdenv, cmake, kdelibs } : + +stdenv.mkDerivation rec { + name = "kgocode-0.0.1"; + + buildInputs = [ cmake kdelibs ]; + + src = fetchgit { + url = https://bitbucket.org/lucashnegri/kgocode.git; + rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6"; + sha256 = "1cjxcy4w46rbx90jrikklh9vw7nz641gq7xlvrq3pjsszxn537gq"; + }; + + meta = with stdenv.lib; { + description = "a plugin for KTextEditor (Kate, KDevelop, among others) that provides basic code completion for the Go programming language. Uses gocode as completion provider"; + homepage = https://bitbucket.org/lucashnegri/kgocode/overview; + maintainers = with maintainers; [ qknight ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6f70b0ae33..2943469147c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10296,6 +10296,10 @@ let gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; }; + kgocode = callPackage ../applications/misc/kgocode { + inherit (pkgs.kde4) kdelibs; + }; + gotags = goPackages.gotags.bin // { outputs = [ "bin" ]; }; golint = goPackages.lint.bin // { outputs = [ "bin" ]; }; From 71240e56a11def5b53ab5563f2f16dbcd013fb82 Mon Sep 17 00:00:00 2001 From: goodwillcoding Date: Sun, 6 Dec 2015 10:54:11 -0800 Subject: [PATCH 063/498] update libgtop to latest (2.32.0) and enable gobject introspection on it --- pkgs/development/libraries/libgtop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index b9ae43a7c8b..30f3802686e 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool }: stdenv.mkDerivation { - name = "libgtop-2.28.5"; + name = "libgtop-2.32.0"; src = fetchurl { - url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.5.tar.xz; - sha256 = "0hik1aklcn79irgw1xf7d6cfkw8hzmy46r9jyfhp32aawisc24n8"; + url = mirror://gnome/sources/libgtop/2.32/libgtop-2.32.0.tar.xz; + sha256 = "13hpml2vfm23816qggr5fvxj75ndb1dq4rgmi7ik6azj69ij8hw4"; }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig perl intltool ]; + nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; } From 026e3424a7d2fb0f0bd08016aaeeb91ba1020ced Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Dec 2015 13:17:41 -0600 Subject: [PATCH 064/498] emacsPackagesNg: include elpaPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f3821e2f4c..919c883ade3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11603,7 +11603,7 @@ let emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit emacs; + inherit emacs elpaPackages; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d457efce4d4..26be7d1cda5 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -35,7 +35,7 @@ , lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs +, emacs, elpaPackages , trivialBuild , melpaBuild @@ -44,9 +44,7 @@ with lib.licenses; -let self = _self // overrides; - callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); - _self = with self; { +let packagesFun = super: self: with self; { inherit emacs; @@ -2025,4 +2023,6 @@ let self = _self // overrides; }; }; -}; in self +}; + +in elpaPackages.override packagesFun From 41f594a29981ca03fc5843e373ee80cfd296583c Mon Sep 17 00:00:00 2001 From: goodwillcoding Date: Sun, 6 Dec 2015 11:26:06 -0800 Subject: [PATCH 065/498] Add gobjectIntrospection to the scope --- pkgs/development/libraries/libgtop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 30f3802686e..e430dc967f8 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, intltool }: +{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }: stdenv.mkDerivation { name = "libgtop-2.32.0"; From 53f93b0b7e0187ad8e50a10e2adf5869b434254e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Dec 2015 20:40:38 +0000 Subject: [PATCH 066/498] w3m: turn off mouseSupport on Darwin Fixes an issue reported at https://github.com/NixOS/nixpkgs/pull/11222/files#r46774825 --- pkgs/applications/networking/browsers/w3m/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e71a733970e..bea74f62358 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -3,7 +3,7 @@ , sslSupport ? true, openssl ? null , graphicsSupport ? true, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null -, mouseSupport ? true, gpm-ncurses ? null +, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null }: assert sslSupport -> openssl != null; From 46c65335cacfdde28a0e30ec73063024e305d48f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 12:18:08 +0000 Subject: [PATCH 067/498] nodejs: 0.10.40 -> 0.10.41 Maintenance release --- pkgs/development/web/nodejs/v0_10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 6ee3c089d2c..5d292a34078 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -6,7 +6,7 @@ }: let - version = "0.10.40"; + version = "0.10.41"; # !!! Should we also do shared libuv? deps = { @@ -32,7 +32,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17qlk4adjk1ls8ka4gbmvcl02xmvxdxhfdmg54bbxbjrv4prrrxs"; + sha256 = "15f9n9pydfb3f6gbbxnh6qqmkmwr0j3gcs8cbnvl69f4lpi99xkr"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ From 59fc3cd8adb109e20e2b0266a303b46a5952ed21 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 12:20:50 +0000 Subject: [PATCH 068/498] nodejs: remove unlinked v4_1_0 The stable branch is v4.x.x and is already taken care of my the default.nix --- pkgs/development/web/nodejs/v4_1_0.nix | 53 -------------------------- 1 file changed, 53 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v4_1_0.nix diff --git a/pkgs/development/web/nodejs/v4_1_0.nix b/pkgs/development/web/nodejs/v4_1_0.nix deleted file mode 100644 index de8fa5f6bd3..00000000000 --- a/pkgs/development/web/nodejs/v4_1_0.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -}: - -let - version = "4.1.0"; - - deps = { - inherit openssl zlib libuv; - - # disabled system v8 because v8 3.14 no longer receives security fixes - # we fall back to nodejs' internal v8 copy which receives backports for now - # inherit v8 - } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { - inherit http-parser; - }); - - inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; -in stdenv.mkDerivation { - name = "nodejs-${version}"; - - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "025lqmhvl7xpx1ip97jwkz21a97sw9zb4zi3y7fgfag59vv0ac25"; - }; - - configureFlags = map (name: "--shared-${name}") (builtins.attrNames deps) ++ [ "--without-dtrace" ]; - - dontDisableStatic = true; - - prePatch = '' - patchShebangs . - ''; - - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode-4.1.0.patch; - - buildInputs = [ python which ] ++ (builtins.attrValues deps) - ++ optional stdenv.isLinux utillinux - ++ optionals stdenv.isDarwin [ openssl libtool ]; - setupHook = ./setup-hook.sh; - - enableParallelBuilding = true; - - passthru.interpreterName = "nodejs"; - - meta = { - description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; - license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.havvy ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} From 989966b29307ee398b20c48fbf8b2584cd35dec4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 12:22:19 +0000 Subject: [PATCH 069/498] nodejs: 4.2.2 -> 4.2.3 CVE-2015-8027 See https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/ --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index d526cc7c7c4..b3958fc8529 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "4.2.2"; + version = "4.2.3"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0"; + sha256 = "0ksmbln5qhrr7qhdz3npwmyz44y1vpznpxk3j7sqkc5lzvjss22h"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; From a6982cc52536f70899f30e5b6791af38ddfa1ab1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 12:23:34 +0000 Subject: [PATCH 070/498] nodejs: 5.0.0 -> 5.1.1 CVE-2015-8027 See https://nodejs.org/en/blog/vulnerability/december-2015-security-releases/ --- pkgs/development/web/nodejs/v5_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v5_0.nix b/pkgs/development/web/nodejs/v5_0.nix index d83efdf2fa5..f9e9ee12edc 100644 --- a/pkgs/development/web/nodejs/v5_0.nix +++ b/pkgs/development/web/nodejs/v5_0.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.0.0"; + version = "5.1.1"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1x6dmk78k4cpdzvxi8390w2w0pvkb6bc1rc64l5a5rks0ri9d3b9"; + sha256 = "1hr2zjwrah8yrih1jsm3v8b449d7xla1rykmyd8yrd80z0jf0yd7"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; From c90d26a2e2c71e4ceb0cbaf02947adaad66b81e4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 6 Dec 2015 15:48:15 +0100 Subject: [PATCH 071/498] nodejs: fix naming of nodejs to fit into their versioning model, fixes #11497 --- pkgs/development/web/nodejs/{default.nix => v4.nix} | 0 pkgs/development/web/nodejs/{v5_0.nix => v5.nix} | 0 pkgs/top-level/all-packages.nix | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/development/web/nodejs/{default.nix => v4.nix} (100%) rename pkgs/development/web/nodejs/{v5_0.nix => v5.nix} (100%) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/v4.nix similarity index 100% rename from pkgs/development/web/nodejs/default.nix rename to pkgs/development/web/nodejs/v4.nix diff --git a/pkgs/development/web/nodejs/v5_0.nix b/pkgs/development/web/nodejs/v5.nix similarity index 100% rename from pkgs/development/web/nodejs/v5_0.nix rename to pkgs/development/web/nodejs/v5.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c658f61933..28d39c15e6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2067,12 +2067,12 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-5_0 = callPackage ../development/web/nodejs/v5_0.nix { + nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { libtool = darwin.cctools; openssl = openssl_1_0_2; }; - nodejs-4_2 = callPackage ../development/web/nodejs { + nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; openssl = openssl_1_0_2; }; @@ -2085,9 +2085,11 @@ let nodejs = if stdenv.system == "armv5tel-linux" then nodejs-0_10 else - nodejs-4_2; + nodejs-4_x; - nodePackages_4_2 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_2; nodejs = nodejs-4_2; }); + nodePackages_5_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }); + + nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }); nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; From 7ac0052ad59c4a826b3db8ad49518a79b0a9c03e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 6 Dec 2015 21:58:45 +0100 Subject: [PATCH 072/498] nodejs: nodePackages_4_2 -> nodePackages_4_x --- 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 28d39c15e6a..fa9ea179452 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2096,7 +2096,7 @@ let nodePackages = if stdenv.system == "armv5tel-linux" then nodePackages_0_10 else - nodePackages_4_2; + nodePackages_4_x; npm2nix = nodePackages.npm2nix; From b3635acffb532eaaf79e512d59f4e2a9d924164b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2015 02:00:07 +0100 Subject: [PATCH 073/498] swingsane: init at 0.2 --- .../graphics/swingsane/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/graphics/swingsane/default.nix diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix new file mode 100644 index 00000000000..0f85bf58c55 --- /dev/null +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: + +let version = "0.2"; in +stdenv.mkDerivation rec { + name = "swingsane-${version}"; + + src = fetchurl { + sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; + url = "mirror://sourceforge/swingsane/swingsane-${version}-bin.zip"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = let + + execWrapper = '' + #!/bin/sh + exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" + ''; + + desktopItem = makeDesktopItem { + name = "swingsane"; + exec = "swingsane"; + icon = "swingsane"; + desktopName = "SwingSane"; + genericName = "Scan from local or remote SANE servers"; + comment = meta.description; + categories = "Office;Application;"; + }; + + in '' + install -v -m 755 -d $out/share/java/swingsane/ + install -v -m 644 *.jar $out/share/java/swingsane/ + + echo "${execWrapper}" > swingsane + install -v -D -m 755 swingsane $out/bin/swingsane + + unzip -j swingsane-${version}.jar "com/swingsane/images/*.png" + install -v -D -m 644 swingsane_512x512.png $out/share/pixmaps/swingsane.png + + cp -v -r ${desktopItem}/share/applications $out/share + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Java GUI for SANE scanner servers (saned)"; + longDescription = '' + SwingSane is a powerful, cross platform, open source Java front-end for + using both local and remote Scanner Access Now Easy (SANE) servers. + The most powerful feature is its ability to query back-ends for scanner + specific options which can be set by the user as a scanner profile. + It also has support for authentication, mutlicast DNS discovery, + simultaneous scan jobs, image transformation jobs (deskew, binarize, + crop, etc), PDF and PNG output. + ''; + homepage = http://swingsane.com/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa9ea179452..9828be3f51c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13046,6 +13046,8 @@ let }) ); + swingsane = callPackage ../applications/graphics/swingsane { }; + sxiv = callPackage ../applications/graphics/sxiv { }; bittorrentSync = bittorrentSync14; From 968986547b6e23e064874ee4530340f52c575735 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2015 02:58:18 +0100 Subject: [PATCH 074/498] man-pages 4.02 -> 4.03 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 923b95040fb..ae7cac62bcb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let version = "4.02"; in +let version = "4.03"; in stdenv.mkDerivation rec { name = "man-pages-${version}"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8"; + sha256 = "177w71rwsw3lsh9pjqy625s5iwz1ahdaj7prys1bpc4bqi78q5mh"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; From ef8dde9eef5b7dd90364db8143d555d27e5c0192 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2015 03:15:54 +0100 Subject: [PATCH 075/498] man-pages-posix: correct `meta.homepage` --- pkgs/data/documentation/man-pages-posix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 78b3aa1c8b3..3fb21a241bf 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; - homepage = http://kernel.org/pub/linux/docs/manpages/; + homepage = https://www.kernel.org/doc/man-pages/; }; } From 47eb4d443026905ff3e0205b8d12456d1c92545e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2015 03:22:42 +0100 Subject: [PATCH 076/498] Migrate manpages -> man-pages (upstream project name) --- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/release-small.nix | 2 +- pkgs/top-level/release.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9828be3f51c..006587dfe99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10806,7 +10806,7 @@ let marathi-cursive = callPackage ../data/fonts/marathi-cursive { }; - manpages = callPackage ../data/documentation/man-pages { }; + man-pages = callPackage ../data/documentation/man-pages { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -15712,6 +15712,7 @@ aliases = with self; rec { youtubeDL = youtube-dl; # added 2014-10-26 pidginlatexSF = pidginlatex; # added 2014-11-02 tftp_hpa = tftp-hpa; # added 2015-04-03 + manpages = man-pages; # added 2015-12-06 }; tweakAlias = _n: alias: with lib; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 4978c2e41b0..60a3a8da76c 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -96,7 +96,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; lynx = linux; lzma = linux; man = linux; - manpages = linux; + man-pages = linux; mc = all; mcabber = linux; mcron = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f4c58e5d9a8..d0c5faf823a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -130,7 +130,7 @@ let lynx = linux; lzma = linux; man = linux; - manpages = linux; + man-pages = linux; maxima = linux; mc = linux; mcabber = linux; From e6046739cd8dbc999c507ccced64d1990d8b35ec Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 08:49:04 +0000 Subject: [PATCH 077/498] doc/submitting-changes: mention master -> staging merge (see issue #11460) --- doc/submitting-changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index fe331d08250..0fd1954c528 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -270,7 +270,7 @@ Additional information. -If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. Keep an eye on the staging evaluations here. +If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. Keep an eye on the staging evaluations here. If any fixes for staging happen to be already in master, then master can be merged into staging. From ce96057588821156d08b48cf8647b6cb8730e63c Mon Sep 17 00:00:00 2001 From: Christian Zagrodnick Date: Fri, 4 Dec 2015 16:17:45 +0100 Subject: [PATCH 078/498] add helper to lib/attrsets: hasAttrByPath --- lib/attrsets.nix | 11 +++++++++++ lib/tests.nix | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 22ecc808679..84f6cb3658b 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -23,6 +23,17 @@ rec { then attrByPath (tail attrPath) default e.${attr} else default; + /* Return if an attribute from nested attribute set exists. + For instance ["x" "y"] applied to some set e returns true, if e.x.y exists. False + is returned otherwise. */ + hasAttrByPath = attrPath: e: + let attr = head attrPath; + in + if attrPath == [] then true + else if e ? ${attr} + then hasAttrByPath (tail attrPath) e.${attr} + else false; + /* Return nested attribute set in which an attribute is set. For instance ["x" "y"] applied with some value v returns `x.y = v;' */ diff --git a/lib/tests.nix b/lib/tests.nix index 1fb2cbf5b53..c3b8839fda9 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -120,4 +120,14 @@ runTests { expected = { success = false; value = false; }; }; + testHasAttrByPathTrue = { + expr = hasAttrByPath ["a" "b"] { a = { b = "yey"; }; }; + expected = true; + }; + + testHasAttrByPathFalse = { + expr = hasAttrByPath ["a" "b"] { a = { c = "yey"; }; }; + expected = false; + }; + } From 83f9fc069cebd8ae69c98a5a3e0bd0a0a443f424 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Dec 2015 15:30:48 +0100 Subject: [PATCH 079/498] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/4619baf1f60fce16b744b4a4e9d8561b2464608d - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/42699553655fac2f34d90e5ecc943704c6a4f8e4 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/57dab1c9974199e11130c3da70ffa31480a9ca37 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/87110f79ed5342f82f5e24bba84fa2ac1a35bb8b --- .../haskell-modules/configuration-lts-0.0.nix | 8 + .../haskell-modules/configuration-lts-0.1.nix | 8 + .../haskell-modules/configuration-lts-0.2.nix | 8 + .../haskell-modules/configuration-lts-0.3.nix | 8 + .../haskell-modules/configuration-lts-0.4.nix | 8 + .../haskell-modules/configuration-lts-0.5.nix | 8 + .../haskell-modules/configuration-lts-0.6.nix | 8 + .../haskell-modules/configuration-lts-0.7.nix | 8 + .../haskell-modules/configuration-lts-1.0.nix | 8 + .../haskell-modules/configuration-lts-1.1.nix | 8 + .../configuration-lts-1.10.nix | 8 + .../configuration-lts-1.11.nix | 8 + .../configuration-lts-1.12.nix | 8 + .../configuration-lts-1.13.nix | 8 + .../configuration-lts-1.14.nix | 8 + .../configuration-lts-1.15.nix | 8 + .../haskell-modules/configuration-lts-1.2.nix | 8 + .../haskell-modules/configuration-lts-1.4.nix | 8 + .../haskell-modules/configuration-lts-1.5.nix | 8 + .../haskell-modules/configuration-lts-1.7.nix | 8 + .../haskell-modules/configuration-lts-1.8.nix | 8 + .../haskell-modules/configuration-lts-1.9.nix | 8 + .../haskell-modules/configuration-lts-2.0.nix | 8 + .../haskell-modules/configuration-lts-2.1.nix | 8 + .../configuration-lts-2.10.nix | 8 + .../configuration-lts-2.11.nix | 8 + .../configuration-lts-2.12.nix | 8 + .../configuration-lts-2.13.nix | 8 + .../configuration-lts-2.14.nix | 8 + .../configuration-lts-2.15.nix | 8 + .../configuration-lts-2.16.nix | 8 + .../configuration-lts-2.17.nix | 8 + .../configuration-lts-2.18.nix | 8 + .../configuration-lts-2.19.nix | 8 + .../haskell-modules/configuration-lts-2.2.nix | 8 + .../configuration-lts-2.20.nix | 8 + .../configuration-lts-2.21.nix | 8 + .../configuration-lts-2.22.nix | 8 + .../haskell-modules/configuration-lts-2.3.nix | 8 + .../haskell-modules/configuration-lts-2.4.nix | 8 + .../haskell-modules/configuration-lts-2.5.nix | 8 + .../haskell-modules/configuration-lts-2.6.nix | 8 + .../haskell-modules/configuration-lts-2.7.nix | 8 + .../haskell-modules/configuration-lts-2.8.nix | 8 + .../haskell-modules/configuration-lts-2.9.nix | 8 + .../haskell-modules/configuration-lts-3.0.nix | 8 + .../haskell-modules/configuration-lts-3.1.nix | 8 + .../configuration-lts-3.10.nix | 9 + .../configuration-lts-3.11.nix | 9 + .../configuration-lts-3.12.nix | 9 + .../configuration-lts-3.13.nix | 9 + .../configuration-lts-3.14.nix | 9 + .../configuration-lts-3.15.nix | 9 + .../configuration-lts-3.16.nix | 9 + .../haskell-modules/configuration-lts-3.2.nix | 8 + .../haskell-modules/configuration-lts-3.3.nix | 8 + .../haskell-modules/configuration-lts-3.4.nix | 8 + .../haskell-modules/configuration-lts-3.5.nix | 8 + .../haskell-modules/configuration-lts-3.6.nix | 8 + .../haskell-modules/configuration-lts-3.7.nix | 8 + .../haskell-modules/configuration-lts-3.8.nix | 8 + .../haskell-modules/configuration-lts-3.9.nix | 9 + .../haskell-modules/hackage-packages.nix | 457 +++++++++++++++--- 63 files changed, 896 insertions(+), 65 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 39ed88df521..2ff53d463a6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4018,6 +4020,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6312,6 +6315,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7034,6 +7038,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8656,6 +8661,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index ae64a29c7f8..fd637efd089 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4017,6 +4019,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6311,6 +6314,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7033,6 +7037,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8655,6 +8660,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index a84c1373c7c..5d103d27334 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4017,6 +4019,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6311,6 +6314,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7033,6 +7037,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8655,6 +8660,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index d16313afef2..cb44b44fba5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4017,6 +4019,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6311,6 +6314,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7033,6 +7037,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8655,6 +8660,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 5dd14262adf..997e32b6637 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4014,6 +4016,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6308,6 +6311,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7029,6 +7033,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8650,6 +8655,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 8decd57903f..0e71e28bb5a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1829,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4014,6 +4016,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -6308,6 +6311,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7029,6 +7033,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8650,6 +8655,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 3b2b2314cea..c20716d6f99 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1826,6 +1827,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4011,6 +4013,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6303,6 +6306,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7023,6 +7027,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8643,6 +8648,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 642fc7fa977..c1446d42b7f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1826,6 +1827,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4011,6 +4013,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6303,6 +6306,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7023,6 +7027,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8643,6 +8648,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 8dca42ee9b5..ead41c58793 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1819,6 +1820,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -4001,6 +4003,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6290,6 +6293,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -7008,6 +7012,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8626,6 +8631,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 605cb0efc2b..91e9a18d20d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1818,6 +1819,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3996,6 +3998,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6281,6 +6284,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6999,6 +7003,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8611,6 +8616,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 650752ee5ba..b7ea8fbd9a3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1816,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3983,6 +3985,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6254,6 +6257,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6970,6 +6974,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8572,6 +8577,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 74dbf8771c1..f95b9dfb2e1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1816,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3982,6 +3984,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6250,6 +6253,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6966,6 +6970,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8568,6 +8573,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index c11b1e51c56..84b5e1a4cb0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1816,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3982,6 +3984,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6249,6 +6252,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6965,6 +6969,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8565,6 +8570,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 91daa23e07f..6f751b83bff 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1816,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3980,6 +3982,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6247,6 +6250,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6963,6 +6967,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8562,6 +8567,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index d18305e2377..e6e0c3a513e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -607,6 +607,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1814,6 +1815,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3977,6 +3979,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6240,6 +6243,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6955,6 +6959,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8554,6 +8559,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 1a030949d04..c5969cc916a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -607,6 +607,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1813,6 +1814,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3972,6 +3974,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6233,6 +6236,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6946,6 +6950,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8542,6 +8547,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 499205c7962..083d790098f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1818,6 +1819,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3993,6 +3995,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6277,6 +6280,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6994,6 +6998,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8605,6 +8610,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index e6c9400fe95..14f07506a5e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1817,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3990,6 +3992,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6273,6 +6276,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6989,6 +6993,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8599,6 +8604,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 99b5a6662d9..1258290c739 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1817,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3989,6 +3991,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6271,6 +6274,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6987,6 +6991,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8595,6 +8600,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index dac91f75f47..53a41015a39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1817,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3989,6 +3991,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6265,6 +6268,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6981,6 +6985,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8589,6 +8594,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 5415b132255..567d8a80710 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1817,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3986,6 +3988,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6260,6 +6263,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6976,6 +6980,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8583,6 +8588,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 76d5755dff0..d476697577c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1817,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3985,6 +3987,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6257,6 +6260,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6973,6 +6977,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8580,6 +8585,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index f920f0dfcc1..f638737f434 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1800,6 +1801,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3946,6 +3948,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6176,6 +6179,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6887,6 +6891,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8470,6 +8475,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index a40332c2785..589be759149 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1799,6 +1800,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -3945,6 +3947,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6174,6 +6177,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6885,6 +6889,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8467,6 +8472,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 998b724d6a8..0d5ed5e62c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1789,6 +1790,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3922,6 +3924,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6131,6 +6134,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6836,6 +6840,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8404,6 +8409,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 2f9fdcace95..03ec74ba772 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1788,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3920,6 +3922,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6124,6 +6127,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6828,6 +6832,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8394,6 +8399,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 30bda422075..d3c45cf95fa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1788,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3920,6 +3922,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6124,6 +6127,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6828,6 +6832,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8393,6 +8398,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index c2f5925a80e..49b1232d2ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1788,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3919,6 +3921,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6121,6 +6124,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6825,6 +6829,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8390,6 +8395,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index b1a58da2e4d..4274a643010 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1787,6 +1788,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3917,6 +3919,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6118,6 +6121,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6821,6 +6825,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8383,6 +8388,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 2635c5769c7..1c0d5a34b32 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1787,6 +1788,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3916,6 +3918,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6114,6 +6117,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6817,6 +6821,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8378,6 +8383,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index ab08a75c97d..ab046c6ce10 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1786,6 +1787,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3909,6 +3911,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6106,6 +6109,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6809,6 +6813,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8369,6 +8374,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_5"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 68e42372a93..acf242873d5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1783,6 +1784,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3902,6 +3904,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6098,6 +6101,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6800,6 +6804,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8360,6 +8365,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_5"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 0f156cc4440..cac29a5c87f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1781,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3898,6 +3900,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6092,6 +6095,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6793,6 +6797,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8351,6 +8356,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index a147151148c..556e67eac1b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1781,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3897,6 +3899,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6089,6 +6092,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6790,6 +6794,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8345,6 +8350,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 20162f4a968..07ce7269875 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1797,6 +1798,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3941,6 +3943,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6169,6 +6172,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6880,6 +6884,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8461,6 +8466,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 51b222c6949..813e6eb409f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1781,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3894,6 +3896,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6086,6 +6089,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6786,6 +6790,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8340,6 +8345,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index bb0ac6243f6..b3c53cb2245 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1781,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3893,6 +3895,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6084,6 +6087,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6783,6 +6787,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8335,6 +8340,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 205ce1a3584..e1a6b0eb2d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1780,6 +1781,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3892,6 +3894,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_4_0"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6080,6 +6083,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6779,6 +6783,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8331,6 +8336,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 46a8defbbc3..0a0b42b079d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1797,6 +1798,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3940,6 +3942,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6167,6 +6170,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6878,6 +6882,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8458,6 +8463,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 605e7a591ab..d81afbaacf5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1796,6 +1797,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3939,6 +3941,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6163,6 +6166,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6873,6 +6877,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8453,6 +8458,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 499eb7c9d36..ca02747456d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1796,6 +1797,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3938,6 +3940,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6161,6 +6164,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6871,6 +6875,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8450,6 +8455,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 69f0f1dd7d0..7d0f1c1fd76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1793,6 +1794,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3933,6 +3935,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6155,6 +6158,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6865,6 +6869,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8442,6 +8447,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index c98a21f0c1b..4d5e4803d56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1792,6 +1793,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3932,6 +3934,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6154,6 +6157,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6864,6 +6868,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8441,6 +8446,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index d3d3f51d088..9f03d32e517 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1791,6 +1792,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3930,6 +3932,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6150,6 +6153,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6859,6 +6863,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8433,6 +8438,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 7cfcc222592..233897be8ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1789,6 +1790,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3924,6 +3926,7 @@ self: super: { "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -6140,6 +6143,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6847,6 +6851,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8416,6 +8421,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 6c1a2b2bb11..c6040a33c57 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -586,6 +586,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1716,6 +1717,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3769,6 +3771,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5867,6 +5870,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6553,6 +6557,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8049,6 +8054,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index b7df56e7e36..eb352029d07 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -586,6 +586,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1714,6 +1715,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3764,6 +3766,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5858,6 +5861,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6543,6 +6547,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8038,6 +8043,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 4e896225942..4bd91a9ff3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -579,6 +579,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1693,6 +1694,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3699,6 +3701,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5761,6 +5764,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6430,6 +6434,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7882,6 +7887,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7958,6 +7966,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 0c9c0cf1c09..b187c422b29 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -579,6 +579,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1691,6 +1692,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3694,6 +3696,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5753,6 +5756,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6421,6 +6425,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7871,6 +7876,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7947,6 +7955,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index c0cc2894018..046dc7deca4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -578,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1690,6 +1691,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3688,6 +3690,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5744,6 +5747,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6412,6 +6416,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7858,6 +7863,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7934,6 +7942,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 14280d9ef81..c7d18ef001b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -578,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1690,6 +1691,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3688,6 +3690,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5740,6 +5743,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6408,6 +6412,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7852,6 +7857,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7928,6 +7936,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index e28ff3719ac..7f0c9a82922 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -578,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1686,6 +1687,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3677,6 +3679,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5726,6 +5729,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -6393,6 +6397,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7833,6 +7838,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7909,6 +7917,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 387317ea794..d81910849e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -578,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1685,6 +1686,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3674,6 +3676,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5720,6 +5723,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -6386,6 +6390,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7822,6 +7827,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7898,6 +7906,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index fff8eb6b220..00850487ff0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -578,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1683,6 +1684,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3670,6 +3672,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5712,6 +5715,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -6375,6 +6379,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7805,6 +7810,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7881,6 +7889,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 220977e57c8..8b834fa3e6c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1711,6 +1712,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3758,6 +3760,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5850,6 +5853,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6532,6 +6536,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8022,6 +8027,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index e9ccb4b7e2b..754890d538f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1710,6 +1711,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3753,6 +3755,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5842,6 +5845,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6523,6 +6527,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8010,6 +8015,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 5bb6b8988fd..b1f7c28eb53 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1710,6 +1711,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3752,6 +3754,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5841,6 +5844,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6522,6 +6526,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -8006,6 +8011,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index f757ca0e6d9..4f782415e74 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1709,6 +1710,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3746,6 +3748,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5827,6 +5830,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6505,6 +6509,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7983,6 +7988,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f9686a9ea1b..f586a3cf79e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1708,6 +1709,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3738,6 +3740,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5814,6 +5817,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6491,6 +6495,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7966,6 +7971,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 75b5a3c260e..706071fc7a7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -583,6 +583,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1703,6 +1704,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3727,6 +3729,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5797,6 +5800,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6470,6 +6474,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7939,6 +7944,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 60bfa401278..3155a11c1fd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -583,6 +583,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1700,6 +1701,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3716,6 +3718,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5784,6 +5787,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6454,6 +6458,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7919,6 +7924,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 726d3c38d96..f6b4862f214 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -582,6 +582,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -1697,6 +1698,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -3708,6 +3710,7 @@ self: super: { "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -5775,6 +5778,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6445,6 +6449,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7910,6 +7915,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7986,6 +7994,7 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 435d7b37c41..a967985c450 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10065,15 +10065,14 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.3.1"; - sha256 = "69edfc4448adfb2ef1883b8540cf9f134eb567e5d02d77076ede0e0e1bb9bfab"; + version = "0.3.2"; + sha256 = "b7a7101f0b27c0917ca8f1e4a9777735d86ffd05bf258ddef650a967e67d4735"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory filepath FPretty libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; - jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -11526,6 +11525,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Kriens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Kriens"; + version = "0.1.0.0"; + sha256 = "05ec474f2b9071c36847937042da5624654e466b96322aa039e0129395ef63b6"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/matteoprovenzano/kriens-hs.git"; + description = "Category for Continuation Passing Style"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KyotoCabinet" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , kyotocabinet @@ -38765,6 +38776,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-tree-builder" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.1.4"; + sha256 = "d4fda93fb4e9d295e8782ac8dda1a46f3a1e86b0f6097ea4bb594f38d3492e3e"; + libraryHaskellDepends = [ base base-prelude bytestring ]; + testHaskellDepends = [ + base-prelude bytestring QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-trie_0_2_4" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -55214,12 +55244,11 @@ self: { ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }: mkDerivation { pname = "dates"; - version = "0.2.2.0"; - sha256 = "0a10c9070d230b966942e08862d379ddcb11942c937008bbabbb5a10a303a921"; + version = "0.2.2.1"; + sha256 = "6dbd2a18aa21435341ab4f537899b60eac38de384597efd2e9eb8c95030c8c09"; libraryHaskellDepends = [ base base-unicode-symbols parsec syb time ]; - jailbreak = true; homepage = "http://redmine.iportnov.ru/projects/dates/"; description = "Small library for parsing different dates formats"; license = stdenv.lib.licenses.bsd3; @@ -55267,8 +55296,8 @@ self: { ({ mkDerivation, base, filepath, parsec, pretty, text, time }: mkDerivation { pname = "dawdle"; - version = "0.1.0.1"; - sha256 = "d6738e621934621cd2a84c108cfa8d940b4c8f6c1e66b15aceb61a711cf9d5e7"; + version = "0.1.0.2"; + sha256 = "6228a3bd300d3577936cea83bd25cad3b015977eeb4b7ba7c18b0665da941856"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec pretty text time ]; @@ -57387,6 +57416,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-builder_0_7_2_1" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers + }: + mkDerivation { + pname = "diagrams-builder"; + version = "0.7.2.1"; + sha256 = "85f889d8ecc484c6ed6f364a37697f7cc410f2ef8ec33c9d7f8d83e6eb31201f"; + configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans cmdargs diagrams-lib directory exceptions + filepath hashable haskell-src-exts hint lens mtl split transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs diagrams-cairo diagrams-lib + diagrams-postscript diagrams-rasterific diagrams-svg directory + filepath JuicyPixels lens lucid-svg + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "hint-based build service for the diagrams graphics EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-cairo_1_2_0_4" = callPackage ({ mkDerivation, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, directory @@ -58160,6 +58218,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-haddock_0_3_0_10" = callPackage + ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring + , Cabal, cautious-file, cmdargs, containers, cpphs + , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath + , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec + , QuickCheck, split, strict, tasty, tasty-quickcheck, text + , uniplate + }: + mkDerivation { + pname = "diagrams-haddock"; + version = "0.3.0.10"; + sha256 = "49ed17c49c1aae075892e9992b691867e418944a37141f028a7a2e6220d6f0af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base base64-bytestring bytestring cautious-file + containers cpphs diagrams-builder diagrams-lib diagrams-svg + directory filepath haskell-src-exts lens linear lucid-svg mtl + parsec split strict text uniplate + ]; + executableHaskellDepends = [ + base Cabal cmdargs cpphs directory filepath + ]; + testHaskellDepends = [ + base containers haskell-src-exts lens parsec QuickCheck tasty + tasty-quickcheck + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Preprocessor for embedding diagrams in Haddock documentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-hsqml" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, hsqml, lens, text, transformers @@ -60033,8 +60124,8 @@ self: { pname = "disk-free-space"; version = "0.1.0.1"; sha256 = "f17a4f9c3b41083ccbb6c11b2debdbc705f86097b7459ff0f46cc01d2692381f"; - revision = "2"; - editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b"; + revision = "3"; + editedCabalFile = "71ac4e0b1a2917e1c5d9dc43c84fdfac1ec7d0d7648582d94e1ce69199971c74"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/redneb/disk-free-space"; description = "Retrieve information about disk space usage"; @@ -68201,6 +68292,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fay_0_23_1_10" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , data-default, data-lens-light, directory, filepath, ghc-paths + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat + , traverse-with-class, type-eq, uniplate, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "fay"; + version = "0.23.1.10"; + sha256 = "600005bf694f64a394934a7dc539b292d928af27f70169a0ac9af0cd8ee0dc76"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default + data-lens-light directory filepath ghc-paths haskell-src-exts + language-ecmascript mtl mtl-compat process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ base mtl optparse-applicative split ]; + jailbreak = true; + homepage = "https://github.com/faylang/fay/wiki"; + description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fay-base_0_19_4_1" = callPackage ({ mkDerivation, base, fay }: mkDerivation { @@ -84401,23 +84523,23 @@ self: { }) {}; "haggis" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , convertible, directory, filemanip, filepath, HDBC, HDBC-sqlite3 - , hquery, MissingH, network, old-locale, optparse-applicative - , pandoc, pandoc-types, parsec, rss, split, text, time, unix - , xmlhtml + ({ mkDerivation, base, blaze-builder, blaze-html, bytestring + , containers, convertible, directory, filemanip, filepath, HDBC + , HDBC-sqlite3, hquery, MissingH, network-uri, old-locale + , optparse-applicative, pandoc, pandoc-types, parsec, rss, split + , text, time, unix, xmlhtml }: mkDerivation { pname = "haggis"; - version = "0.1.2.1"; - sha256 = "4fbeb799154eae6550532468f56cbb3d0c026bda37ef97c421ee70233cd1b826"; + version = "0.1.3.0"; + sha256 = "68f91cffb7c2078b5c33daba0d88c46e97f3c245d811d507fa42f06567c0cf38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder bytestring containers convertible directory - filemanip filepath HDBC HDBC-sqlite3 hquery MissingH network - old-locale pandoc pandoc-types parsec rss split text time unix - xmlhtml + base blaze-builder blaze-html bytestring containers convertible + directory filemanip filepath HDBC HDBC-sqlite3 hquery MissingH + network-uri old-locale pandoc pandoc-types parsec rss split text + time unix xmlhtml ]; executableHaskellDepends = [ base directory filemanip filepath optparse-applicative @@ -89806,7 +89928,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql_0_14_0_2" = callPackage + "hasql_0_15_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , contravariant, contravariant-extras, data-default-class, dlist , either, hashable, hashtables, loch-th, placeholders @@ -89817,8 +89939,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.14.0.2"; - sha256 = "b07aa754eb948c56b99f0cee5c360a3bf5566bba3cc2d429f329d6ad52184193"; + version = "0.15.0.2"; + sha256 = "1264ebf39cd39977175f96f00c4330bbecd96882ac7463dd627b1e7cff3c9f52"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring contravariant contravariant-extras data-default-class dlist either hashable @@ -90289,6 +90411,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-transaction" = callPackage + ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, either, hasql + , postgresql-error-codes, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.3.1"; + sha256 = "dec9cbb6be2ca68da83af8a512293f6b41ebfc7747cc38105d5aed11625c9037"; + libraryHaskellDepends = [ + base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras either hasql postgresql-error-codes + transformers + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + }) {}; + "hastache_0_6_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, syb, text, transformers @@ -93420,8 +93562,8 @@ self: { ({ mkDerivation, base, harp }: mkDerivation { pname = "hharp"; - version = "0.1.1.0"; - sha256 = "da3847a04062d7c6320c41d60636c7d653c0ed008666c36af79d59c1a80cf3b8"; + version = "0.1.1.1"; + sha256 = "f5868e6f1f34f5448c4865f286ba06b186a47fc61894d20707dedb2b9214b65e"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ harp ]; jailbreak = true; @@ -98944,8 +99086,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.1.8"; - sha256 = "1949af97eb85cb212d9e7938d35f5fa1562eabdcac23f23f7479e6ee536aa94f"; + version = "2.1.9"; + sha256 = "70961b74f932e7f6a4615eb5ae39e9d72db1b53ec33998dc66b053f2c09a6bf5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100786,6 +100928,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_0_7" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.0.7"; + sha256 = "35b68bd3c956143760a149479a2debe4ccc1f63acf13e592c741b1f5cb63b3ce"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -119491,8 +119653,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.8"; - sha256 = "34377397255a7fd2b1e77ee25d9e865e1bb7e8ce394519458f2d819727d59878"; + version = "1.9"; + sha256 = "621f0dbd1bfc57d7fbd593698ed31af9b1943ba65fc9ece31514d6caab58748a"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -125104,8 +125266,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.1.5.2"; - sha256 = "388d3711ac1f6ff15264c34d5920ce899efd2834363a9028c18facea01e0c1e2"; + version = "0.1.6.2"; + sha256 = "d074a16877f078da4794b7f26b7edea7eec1df7a41527a5005a3b4d6f2abef02"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq hmatrix MemoTrie semigroups tagged transformers vector vector-space void @@ -129420,6 +129582,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-skeleton_0_1_2_2" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "monad-skeleton"; + version = "0.1.2.2"; + sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3"; + libraryHaskellDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "An undead monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -130694,8 +130869,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.4.0"; - sha256 = "c53ae91b4d2583dc980e27396f7bdae7ac943ec14aca134b621a21d9ae593e66"; + version = "1.4.1"; + sha256 = "3018b6a951b19d0c1bb9109e7e5d11059fe8f78743cb13b33a3be2c1da5e78d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144736,6 +144911,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pinchot" = callPackage + ({ mkDerivation, base, containers, Earley, template-haskell + , transformers + }: + mkDerivation { + pname = "pinchot"; + version = "0.2.0.0"; + sha256 = "292bf5416f7fee0573aec8ca989704b422f50957afebd3098b1f2f953e4d3805"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers Earley template-haskell transformers + ]; + homepage = "http://www.github.com/massysett/pinchot"; + description = "Build parsers and ASTs for context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -149874,8 +150067,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.14.0"; - sha256 = "b8b06a61b3991cb177880de43bf94014492807095f8249fc1389a746c8edeef3"; + version = "2.15.0"; + sha256 = "93899ba66749337382158cbb9c2289341eb8d104d26b47dc05c71fe68ba8f53e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150109,8 +150302,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.1.8"; - sha256 = "757bcc2b99105f787209e89dd1937b14b55e8ac66bb39be7e16eb972b5c4c2dd"; + version = "2.1.9"; + sha256 = "bcef7e31d467c92429092b2900411569eb2eb2a9f3799409560b20e53afd0f10"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -150188,8 +150381,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.1.8"; - sha256 = "dc8a48fdef6852a9b2d328927a957e00b086e699cd810542ed379eba1910eedb"; + version = "2.1.9"; + sha256 = "73ce09dc61ce920401cf98d689255d2bbde2cda19c179c3c757c4e1ecc28455a"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -159473,15 +159666,20 @@ self: { }) {}; "rtcm" = callPackage - ({ mkDerivation, base, basic-prelude, tasty, tasty-hunit }: + ({ mkDerivation, array, base, basic-prelude, binary, binary-bits + , bytestring, lens, tasty, tasty-hunit, template-haskell, word24 + }: mkDerivation { pname = "rtcm"; - version = "0.1.0"; - sha256 = "efff5ccbb113897027a7a5a24616a498e37d769341c026342ad19f03490bc2a4"; - libraryHaskellDepends = [ base basic-prelude ]; + version = "0.1.2"; + sha256 = "c970dc6c60f0a72669fd2f87bab4f3bba57eb7336d3851dda18db6ccc0d18576"; + libraryHaskellDepends = [ + array base basic-prelude binary binary-bits bytestring lens + template-haskell word24 + ]; testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "http://github.com/swift-nav/librtcm"; - description = "Haskell bindings for RTCM"; + description = "RTCM Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -160735,15 +160933,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_5" = callPackage + "sbv_5_6" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, mtl , old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.5"; - sha256 = "ee5f5b81b1e84a85285870a34295a4a40a8ab6203a6be5f8f596921a15c2cd67"; + version = "5.6"; + sha256 = "018c91265799931c434731cfd48e8592e42f399ab5958f4c70ffe48e83fd3fed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160757,6 +160955,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sbvPlugin" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , ghc-prim, mtl, process, sbv, tasty, tasty-golden + , template-haskell + }: + mkDerivation { + pname = "sbvPlugin"; + version = "0.1"; + sha256 = "08fc5562e6919ddb8db1fa8b5c16079f9832c3d755d58e987f25945f36903c0b"; + libraryHaskellDepends = [ + base containers ghc ghc-prim mtl sbv template-haskell + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-golden + ]; + jailbreak = true; + homepage = "http://github.com/LeventErkok/sbvPlugin"; + description = "Analyze Haskell expressions using SBV/SMT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sc3-rdu" = callPackage ({ mkDerivation, base, hsc3, hsc3-db }: mkDerivation { @@ -164847,10 +165066,9 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "sext"; - version = "0.1.0.0"; - sha256 = "fef2cc9767547792aa1f1baee9e415362734abf0ba2b8953f5eed487ea72076f"; + version = "0.1.0.2"; + sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a"; libraryHaskellDepends = [ base bytestring template-haskell text ]; - jailbreak = true; homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; license = stdenv.lib.licenses.bsd3; @@ -172678,8 +172896,8 @@ self: { pname = "stack"; version = "0.1.6.0"; sha256 = "a47ffc204b9caef8281d1e5daebc21bc9d4d2414ed695dc10d32fcca4d81978d"; - revision = "4"; - editedCabalFile = "cfc1b7a59cde2c61025289f16f0f397a5b96adaa75cbcbc729947b241ef38921"; + revision = "6"; + editedCabalFile = "c9021f29f8e46134d9036fb8592edcfd31a0a0942dadcb4860b269f2aa463a34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172748,8 +172966,8 @@ self: { pname = "stack"; version = "0.1.8.0"; sha256 = "89bca19a39f3148daa55dd51bcee28c9f8aa362732c915dd25a85c7a7c664338"; - revision = "2"; - editedCabalFile = "ca3f895597fed572f4dcde2a83ba0c22120ab58448bfffb8267a72ff15072dd9"; + revision = "4"; + editedCabalFile = "b44318f1c13bdb7c1a8de14cc7c8707d1f4a215af985f178d19ddd733986a4ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172818,6 +173036,8 @@ self: { pname = "stack"; version = "0.1.10.0"; sha256 = "9b730c2b4b7bb87fc70ccbf0bab0e2fe6f0775644b36972b4dea9088cbcab979"; + revision = "2"; + editedCabalFile = "7e5e72d10fce3a9fad12241e48098219d381dedfda71327034f1899a3da537e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172870,8 +173090,8 @@ self: { }: mkDerivation { pname = "stack-hpc-coveralls"; - version = "0.0.2.0"; - sha256 = "740f781e83f3cca39e9237b7275d9a5f8636938cf09dfd310e808ddaa2f9a9a5"; + version = "0.0.3.0"; + sha256 = "b7e0811516216cb5d20294c9371787e5d08663126c224f7a976e90101fd6eb22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174996,8 +175216,8 @@ self: { }: mkDerivation { pname = "streaming"; - version = "0.1.3.3"; - sha256 = "7199654f1bfbbed976264a49eab8de8c53a350e156115fe5a9da0a5a1798e507"; + version = "0.1.3.4"; + sha256 = "1a23959815ca3396521c850df6b90f6d8941eddab67e6512634fead2c9c29c5a"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph mtl resourcet time transformers transformers-base @@ -180004,6 +180224,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tellbot_0_6_0_10" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, containers + , http-conduit, mtl, network, regex-pcre, split, tagsoup, text + , time, transformers + }: + mkDerivation { + pname = "tellbot"; + version = "0.6.0.10"; + sha256 = "7b853263a4522ec8839a429c0d2be76ca2c7427f0693ce6a84b7a6067e979373"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors bytestring containers http-conduit mtl network + regex-pcre split tagsoup text time transformers + ]; + homepage = "https://github.com/phaazon/tellbot"; + description = "IRC tellbot"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "template" = callPackage ({ mkDerivation, base, mtl, text }: mkDerivation { @@ -188518,15 +188759,14 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.4.1.1"; - sha256 = "68e3b4877590343cd668ba2a8637b3e008bcfbebac79f99f2380d216210f843d"; + version = "0.4.1.2"; + sha256 = "d00604f3ba2970a714fb656fc79a6481f833356af32ffd2bbb30cf025db9acbd"; libraryHaskellDepends = [ base containers explicit-exception transformers utility-ht ]; testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; @@ -200512,6 +200752,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-query" = callPackage + ({ mkDerivation, base-prelude, free, text }: + mkDerivation { + pname = "xml-query"; + version = "0.9.0.2"; + sha256 = "008d596529cffde397c55026c10c8a20951272959e2a6e35cfdfef499719ec7b"; + libraryHaskellDepends = [ base-prelude free text ]; + homepage = "https://github.com/sannsyn/xml-query"; + description = "A parser-agnostic declarative API for querying XML-documents"; + license = stdenv.lib.licenses.mit; + }) {}; + + "xml-query-xml-conduit" = callPackage + ({ mkDerivation, base-prelude, text, xml-conduit, xml-query + , xml-query-xml-types, xml-types + }: + mkDerivation { + pname = "xml-query-xml-conduit"; + version = "0.3"; + sha256 = "daa66b0b16961b090d47278e4ad92b1b776080e1c675e414c65640db13118ecb"; + libraryHaskellDepends = [ + base-prelude text xml-conduit xml-query xml-query-xml-types + xml-types + ]; + homepage = "https://github.com/sannsyn/xml-query-xml-conduit"; + description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + + "xml-query-xml-types" = callPackage + ({ mkDerivation, base, base-prelude, data-default-class, free + , html-entities, QuickCheck, quickcheck-instances, success, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + , transformers, xml-conduit, xml-query, xml-types + }: + mkDerivation { + pname = "xml-query-xml-types"; + version = "0.4"; + sha256 = "28291319efbb60d4a2889cf1319d3fd5aa63b71ec9f29562ec1fdfa243ce7b81"; + libraryHaskellDepends = [ + base-prelude free html-entities success text transformers xml-query + xml-types + ]; + testHaskellDepends = [ + base base-prelude data-default-class QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text xml-conduit xml-query xml-types + ]; + homepage = "https://github.com/sannsyn/xml-query-xml-types"; + description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; + license = stdenv.lib.licenses.mit; + }) {}; + "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix @@ -203299,7 +203592,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth-oauth2" = callPackage + "yesod-auth-oauth2_0_1_4" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , http-client, http-conduit, http-types, lifted-base, network-uri , random, text, transformers, vector, yesod-auth, yesod-core @@ -203317,9 +203610,10 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth-oauth2_0_1_5" = callPackage + "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , http-client, http-conduit, http-types, lifted-base, network-uri , random, text, transformers, vector, yesod-auth, yesod-core @@ -203337,7 +203631,6 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-pam" = callPackage @@ -204376,6 +204669,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_4_16_1" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.4.16.1"; + sha256 = "def7ebf5f2d9cc0366fc9309603029b59f750b9045ae5ace4352bce5b0027fbd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate From 9b2d64f310f12879d2f10bf2f2fc936f4c72e2c1 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 09:26:55 +0000 Subject: [PATCH 080/498] cbatticon: use fetchzip to fix sha256 issues --- pkgs/applications/misc/cbatticon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 78cd08e212c..0a7fb1e5f3f 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: +{ stdenv, fetchzip, gtk, libnotify, unzip, glib, pkgconfig }: stdenv.mkDerivation rec { name = "cbatticon-${version}"; version = "1.4.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/valr/cbatticon/archive/${version}.zip"; - sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + sha256 = "0ixkxvlrn84b8nh75c9s2gvxnycis89mf047iz8j38814979di5l"; }; makeFlags = "PREFIX=$(out)"; From 0a9b784acc05c3b6968f5b1faa454afd5b2c3379 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 10:38:38 +0000 Subject: [PATCH 081/498] namecoin: fix sha256 using fetchzip --- pkgs/applications/altcoins/namecoind.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix index baf6ba0dbc0..5b393330147 100644 --- a/pkgs/applications/altcoins/namecoind.nix +++ b/pkgs/applications/altcoins/namecoind.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, db4, boost, openssl, miniupnpc, unzip }: +{ stdenv, fetchzip, db4, boost, openssl, miniupnpc, unzip }: with stdenv.lib; stdenv.mkDerivation rec { version = "0.3.80"; name = "namecoind-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; - sha256 = "1755mqxpg91wg9hf0ibpj59sdzfmhh73yrpi7hfi2ipabkwmlpiz"; + sha256 = "0mbkhj7y3f4vbqp5q3zk27bzqlk2kq71rcgivvj06w29fzd64mw6"; }; buildInputs = [ db4 boost openssl unzip miniupnpc ]; From 4b950d233e98d497f592a4e03f262475236dd743 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Dec 2015 05:50:02 -0600 Subject: [PATCH 082/498] ipe: 7.1.8 -> 7.1.10 --- pkgs/applications/graphics/ipe/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index ede0dc07afb..9f1f53abc5c 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX -, libjpeg +{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX +, libjpeg, qtbase , makeWrapper }: let ghostscript = ghostscriptX; in stdenv.mkDerivation rec { - name = "ipe-7.1.8"; + name = "ipe-7.1.10"; src = fetchurl { - url = "http://github.com/otfried/ipe/raw/master/releases/7.1/${name}-src.tar.gz"; - sha256 = "1zx6dyr1rb6m6rvawagg9f8bc2li9nbighv2dglzjbh11bxqsyva"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz"; + sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz"; }; # changes taken from Gentoo portage @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper + libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c92d8aadd9..5325ae6e417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12131,7 +12131,7 @@ let lua = lua5; }; - ipe = callPackage ../applications/graphics/ipe { }; + ipe = qt5Libs.callPackage ../applications/graphics/ipe { }; iptraf = callPackage ../applications/networking/iptraf { }; From ace303f79c2d6b8389fdb5595e4d42529342463c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Dec 2015 06:28:56 -0600 Subject: [PATCH 083/498] emacsPackagesNg: pass melpaBuild, trivialBuild to packages --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 26be7d1cda5..3882153d8e0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -46,7 +46,7 @@ with lib.licenses; let packagesFun = super: self: with self; { - inherit emacs; + inherit emacs melpaBuild trivialBuild; ## START HERE From b9093f1c641846882fdced70269a4ee09c2c376b Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 5 Dec 2015 21:48:20 +0100 Subject: [PATCH 084/498] chromium: Updates, fixes #11492 Built and run Beta and Stable locally. Dev is surrently superseded by Stable so it doesn't matter much. - Dev: 47.0.2508.0 -> 48.0.2564.22 - Beta: 46.0.2490.64 -> 48.0.2564.23 - Stable: 45.0.2454.101 -> 47.0.2526.73 Changed the SSL dependencies to the supported configuration on Linux (according to Torne @Freenode/#chromium-support). - NSS is a dependency since it is used to access the ceritiface store. - Dropped system OpenSSL support, the bundled BoringSSL is used. This probably fixes issue #10555. Note that without this adjustment the build fails even. Dropped uneeded old patches. --- .../networking/browsers/chromium/browser.nix | 3 - .../networking/browsers/chromium/common.nix | 8 +- .../networking/browsers/chromium/default.nix | 4 +- .../browsers/chromium/source/default.nix | 11 +-- .../chromium/source/nix_plugin_paths_44.patch | 84 ------------------- .../browsers/chromium/source/sources.nix | 24 +++--- 6 files changed, 17 insertions(+), 117 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e662e9bf836..c1f2cbbce4d 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,9 +12,6 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${optionalString (versionOlder base.version "44.0.0.0") '' - cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" - ''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" cp -v "$buildPath/chrome_sandbox" "$libExecPath/chrome-sandbox" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0490afc04bc..fbd775f6f98 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, libexif, pciutils +, libusb1, libexif, pciutils, nss , python, pythonPackages, perl, pkgconfig , nspr, udev, kerberos @@ -22,7 +22,6 @@ , enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false -, useOpenSSL ? false, nss ? null, openssl ? null , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true @@ -65,7 +64,6 @@ let use_system_opus = true; use_system_snappy = true; use_system_speex = true; - use_system_ssl = useOpenSSL; use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; @@ -107,8 +105,7 @@ let buildInputs = defaultDependencies ++ [ which python perl pkgconfig - nspr udev - (if useOpenSSL then openssl else nss) + nspr nss udev utillinux alsaLib bison gperf kerberos glib gtk dbus_glib @@ -155,7 +152,6 @@ let linux_link_pulseaudio = pulseSupport; disable_nacl = !enableNaCl; enable_hotwording = enableHotwording; - use_openssl = useOpenSSL; selinux = enableSELinux; use_cups = cupsSupport; } // { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 9a7f4a2757e..bf870e144e5 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,6 @@ , enableSELinux ? false , enableNaCl ? false , enableHotwording ? false -, useOpenSSL ? false , gnomeSupport ? false , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -23,11 +22,10 @@ let source = callPackage ./source { inherit channel; # XXX: common config - inherit useOpenSSL; }; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording useOpenSSL gnomeSupport + inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; }; diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index da962c6b768..4e568aed594 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, patchutils, python , channel ? "stable" -, useOpenSSL # XXX }: with stdenv.lib; @@ -36,8 +35,6 @@ in stdenv.mkDerivation { --exclude='*/.*' ''; - opensslPatches = optional useOpenSSL openssl.patches; - prePatch = '' for i in $outputs; do eval patchShebangs "\$$i" @@ -45,10 +42,8 @@ in stdenv.mkDerivation { ''; patches = - (if versionOlder version "45.0.0.0" - then singleton ./nix_plugin_paths_44.patch - else singleton ./nix_plugin_paths_46.patch ++ - optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch) ++ + singleton ./nix_plugin_paths_46.patch ++ + singleton ./build_fixes_46.patch ++ singleton ./widevine.patch; patchPhase = let @@ -71,8 +66,6 @@ in stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; passthru = { diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch deleted file mode 100644 index 326da7f420a..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 8a205a6..d5c24e1 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -97,21 +97,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - } // namespace -@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(FILE_PATH_LITERAL("script.log")); - break; - case chrome::FILE_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) - return false; - cur = cur.Append(kInternalFlashPluginFileName); - break; -@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 3ce3dd813c1..55facf55438 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "47.0.2508.0"; - sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; - sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; - sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; + version = "48.0.2564.22"; + sha256 = "18kk8vmv7c8dsxdghvrjl90davm0gc4wdvs5zmsgiymlw1c6qpaj"; + sha256bin32 = "1b10bb83npnn24fxl7jqkrhjzhk211cgf1f2ykx50z3cc41v4rvp"; + sha256bin64 = "0a3w22blkpnk1wdg201ixm8jm7lrn4md64wcllmm69z433flrg1b"; }; beta = { - version = "46.0.2490.64"; - sha256 = "1k2zir4rbs7hwdasbjpwyjr4ibis2vm6lx45bfm2r2f469mf3y2g"; - sha256bin32 = "0j1xncws0r5z2rvvjsi0gxxmnslfcbiasaxr6bjhbxnzjv7chrd4"; - sha256bin64 = "1m8vv3qh79an3719afz7n2ijqanf4cyxz2q4bzm512x52z5zipl7"; + version = "48.0.2564.23"; + sha256 = "0rhjrvxsxv84jahnph26lbivfa6g48qmv1mw6wysjx8rvfpfx9g9"; + sha256bin32 = "17330cv6zv25z5y6pbfc9hb7vk77yggvcdggknkvvbfd0p6mrf4z"; + sha256bin64 = "0d3r64ipgigjqgnr57lklk5icv2snd2gq9w6aw7apfx61qlbnxly"; }; stable = { - version = "45.0.2454.101"; - sha256 = "1yw5xlgy5hd3iwcyf0sillq5p367fcpvp4mizpmv52cwmv52ss0v"; - sha256bin32 = "1ll8lmkmx7v74naz1vcnrwk5ighh0skfcb66jkq4kgxrb5fjgwm5"; - sha256bin64 = "1cwbd3n77dnbfnrfr8g0qng9xkgvz6y7mx489gpx1wsamgi42bzj"; + version = "47.0.2526.73"; + sha256 = "1xgl2pmvfxnm2pk4p4p4v642ip0cxxjysc1xy4pmdxnzilfd0rkd"; + sha256bin32 = "1y9g14s81xanp70l0s6grszn4q0acn4rgm46i5kigf37s1cbwagy"; + sha256bin64 = "1y00znk5cfd1nvh4dx92b0m8q38849i25a18zg2lhvjqrpq097za"; }; } From 53441bcc93d6e706bc1de5a1180e3717fd6698eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Mon, 7 Dec 2015 00:54:26 +0100 Subject: [PATCH 085/498] nginx: 1.9.4 -> 1.9.7, fixes #11515 --- pkgs/servers/http/nginx/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 45129dbe0d3..a80632cd1c9 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -7,10 +7,10 @@ with stdenv.lib; let - version = "1.9.4"; + version = "1.9.7"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7"; + sha256 = "1ma82wfg9akghx1cnzfmz4nplf0zjv1rk49x4v3f3z7xmwbx4jvr"; }; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-http_ssl_module" - "--with-http_spdy_module" + "--with-http_v2_module" "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" From 067141621e43773571f6d76111b738dd3b5f835c Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 6 Dec 2015 19:36:15 +0100 Subject: [PATCH 086/498] virtualboxGuestAdditions: Add missing library paths to patchelf, fixes #11509 --- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f4d8abb49ab..b6b05806a00 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation { for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib:${dbus}/lib $i + patchelf --set-rpath $out/lib:${dbus}/lib:${libXcomposite}/lib:${libXdamage}/lib:${libXext}/lib:${libXfixes}/lib $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions From 6c9931c55689ca668c6e0d3cff215b61f05b8ce8 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Mon, 7 Dec 2015 04:54:48 +0100 Subject: [PATCH 087/498] shout: fix preStart, fixes #11516 preStart must be a string --- nixos/modules/services/networking/shout.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index f55b87a9614..fe3cba8f149 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -57,7 +57,7 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - preStart = if isNull cfg.configFile then null + preStart = if isNull cfg.configFile then "" else '' ln -sf ${pkgs.writeText "config.js" cfg.configFile} \ ${shoutHome}/config.js From 700835bb456559fddb7ef55161d7ccf5e8e21d5d Mon Sep 17 00:00:00 2001 From: "Desmond O. Chang" Date: Mon, 7 Dec 2015 21:17:46 +0800 Subject: [PATCH 088/498] yank: 0.4.1 -> 0.6.0, fixes #11522 --- pkgs/tools/misc/yank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 049fc1b5f3f..f6b61de2a98 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "066nsm8b5785r2zaajihf8g6x9hc4n8kpk3j2n1slp5alnhx93mx"; + sha256 = "0v1imwjp851gz86p9m3x1dd8bi649gr8j99xz6ask1pbkxvji73c"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.4.1"; + version = "0.6.0"; maintainers = [ maintainers.dochang ]; }; From b789856ce3bb4029d24acf90c321d0f36d4971f9 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 14:23:23 +0000 Subject: [PATCH 089/498] gosmore: r30811 -> r31801, fix sha256 --- pkgs/applications/misc/gosmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 43631ecdb24..67c21aea9e6 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : let - version = "30811"; + version = "31801"; in stdenv.mkDerivation { name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0d8ddfa0nhz51ambwj9y5jjbizl9y9w44sviisk3ysqvn8q0phds"; + sha256 = "0i6m3ikavsaqhfy18sykzq0cflw978nr4fhg18hawndcmr45v5zj"; rev = "${version}"; }; From 9ebc3994328e43548d80be1de8efa6d12f8a2edf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 29 Nov 2015 14:46:41 +0000 Subject: [PATCH 090/498] ruby_2_0: 2.0.0p645 -> 2.0.0p647 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a9bc2f775bb..0be983e79e2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -150,10 +150,10 @@ in { majorVersion = "2"; minorVersion = "0"; teenyVersion = "0"; - patchLevel = "645"; + patchLevel = "647"; sha256 = { - src = "1azl3kbqqw3jvwfcsy6fdb7vmwz5w73fwpq1y1gblz79zzzqx7sy"; - git = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb"; + src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; + git = "bd9b6cc8ea984b38d245fb3be1b918ec677f29f394ede43bbf5cf00e88edd899"; }; }; From d9f0568ccb766d4bce4e9ffd97a6df618fb77500 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 29 Nov 2015 14:47:47 +0000 Subject: [PATCH 091/498] ruby_2_1: 2.1.6 -> 2.1.7 --- pkgs/development/interpreters/ruby/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 0be983e79e2..71fca783b07 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -212,6 +212,17 @@ in { }; }; + ruby_2_1_7 = generic { + majorVersion = "2"; + minorVersion = "1"; + teenyVersion = "7"; + patchLevel = "0"; + sha256 = { + src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; + git = "c5ecad94558547b6a50cf64d379829fecd62f3ca175626827f435237a3c6be5c"; + }; + }; + ruby_2_2_0 = generic { majorVersion = "2"; minorVersion = "2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4b93235f2b..d77de864d4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5240,14 +5240,14 @@ let inherit (callPackage ../development/interpreters/ruby {}) ruby_1_9_3 ruby_2_0_0 - ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 + ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7 ruby_2_2_0 ruby_2_2_2; # Ruby aliases ruby = ruby_2_2; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; - ruby_2_1 = ruby_2_1_6; + ruby_2_1 = ruby_2_1_7; ruby_2_2 = ruby_2_2_2; rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) { From 7c338ffb7721b44cec789621caa650f51bce38f7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 29 Nov 2015 14:48:51 +0000 Subject: [PATCH 092/498] ruby_2_2: 2.2.2 -> 2.2.3 --- pkgs/development/interpreters/ruby/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 71fca783b07..2567db0736a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -244,4 +244,15 @@ in { git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn"; }; }; + + ruby_2_2_3 = generic { + majorVersion = "2"; + minorVersion = "2"; + teenyVersion = "3"; + patchLevel = "0"; + sha256 = { + src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; + git = "a62301ca31ef23c9ae88ca68c925df5c0cbf4319265befc3a2fa27a56213cb88"; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77de864d4f..b166c3d35bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5241,14 +5241,14 @@ let ruby_1_9_3 ruby_2_0_0 ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7 - ruby_2_2_0 ruby_2_2_2; + ruby_2_2_0 ruby_2_2_2 ruby_2_2_3; # Ruby aliases ruby = ruby_2_2; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_7; - ruby_2_2 = ruby_2_2_2; + ruby_2_2 = ruby_2_2_3; rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) { inherit ruby; From f399ab50d87dcbb52018f3ecb7377ebdb22f9aa1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 13:12:24 +0000 Subject: [PATCH 093/498] ruby: update railsexpress patchsets, fixes #11347 --- pkgs/development/interpreters/ruby/patchsets.nix | 16 ++++++++++++++++ .../interpreters/ruby/rvm-patchsets.nix | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 0995e23890d..5f270dfe9c7 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -91,6 +91,17 @@ let self = rec { "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch" ]; + "2.1.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" + ]; "2.2.0" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch" @@ -104,4 +115,9 @@ let self = rec { "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch" ]; + "2.2.3" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; }; in self diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 908b4b36372..f12402f0a0b 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "68be466019aa592e0321e894487f090aa459d602"; - sha256 = "12dw5shirnqbw037jg1sqk1aixyzl32w94y2nlan9by3cv7k3643"; + rev = "8ccf24490fec2218374734520c27d925078096de"; + sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f"; } From 9a350d5f1e1b3f983ef5adf420d56d08983be9ed Mon Sep 17 00:00:00 2001 From: Markus Wotringer Date: Sun, 29 Nov 2015 01:30:42 +0100 Subject: [PATCH 094/498] cntlm: refactor to systemd service, fixes #11339 --- nixos/modules/services/networking/cntlm.nix | 34 ++++++++++----------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index a50aa4d0636..76c0fd7d0ea 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -73,29 +73,28 @@ in ###### implementation config = mkIf config.services.cntlm.enable { - + systemd.services.cntlm = { + description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = "cntlm"; + ExecStart = '' + ${pkgs.cntlm}/bin/cntlm -U cntlm \ + -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} + ''; + }; + }; + services.cntlm.netbios_hostname = mkDefault config.networking.hostName; - users.extraUsers = singleton { + users.extraUsers.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; home = "/var/empty"; }; - jobs.cntlm = - { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; - - startOn = "started network-interfaces"; - - daemonType = "fork"; - - exec = - '' - ${pkgs.cntlm}/bin/cntlm -U cntlm \ - -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} - ''; - }; - services.cntlm.extraConfig = '' # Cntlm Authentication Proxy Configuration @@ -108,8 +107,7 @@ in ${concatMapStrings (port: '' Listen ${toString port} '') cfg.port} - ''; - + ''; }; } From e8d97ef4f575dfa14fd9421ce3700f4db306a636 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 15:06:53 +0000 Subject: [PATCH 095/498] partclone: use fetchFromGitHub and fix sha256 --- pkgs/tools/backup/partclone/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 928c0494a1c..3b432ea609d 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub , pkgconfig, libuuid , e2fsprogs }: @@ -6,10 +6,11 @@ stdenv.mkDerivation { name = "partclone-stable"; enableParallelBuilding = true; - src = fetchurl { - url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable; - sha256 = "12bnhljc4n4951p5c05gc7z5qwdsjpx867ad1npmgsm8d9w941sn"; - name = "Thomas-Tsai-partclone-stable-20150722.tar.gz"; + src = fetchFromGitHub { + owner = "Thomas-Tsai"; + repo = "partclone"; + rev = "stable"; + sha256 = "0q3brjmnldpr89nhbiajxg3gncz0nagc34n7q2723lpz7bn28w3z"; }; buildInputs = [e2fsprogs pkgconfig libuuid]; From 0d3db2477b687a0e36573a15ca53791b6c033926 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 15:13:25 +0000 Subject: [PATCH 096/498] partclone: fix build - requires automake and autoconf --- pkgs/tools/backup/partclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 3b432ea609d..9aea0c80c6f 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub , pkgconfig, libuuid -, e2fsprogs +, e2fsprogs, automake, autoconf }: stdenv.mkDerivation { name = "partclone-stable"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0q3brjmnldpr89nhbiajxg3gncz0nagc34n7q2723lpz7bn28w3z"; }; - buildInputs = [e2fsprogs pkgconfig libuuid]; + buildInputs = [e2fsprogs pkgconfig libuuid automake autoconf]; installPhase = ''make INSTPREFIX=$out install''; From 7afce99e6108e218baf0499129834f2deb739a60 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Dec 2015 17:36:28 +0000 Subject: [PATCH 097/498] libtorrent, rtorrent: merge *-git into default, drop outdated *-git versions, cleanup This also gives the man page (it is outdated, though). --- .../networking/p2p/libtorrent/default.nix | 20 +++--- pkgs/tools/networking/p2p/libtorrent/git.nix | 28 --------- .../tools/networking/p2p/rtorrent/default.nix | 44 +++++++++---- pkgs/tools/networking/p2p/rtorrent/git.nix | 63 ------------------- pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 45 insertions(+), 114 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/libtorrent/git.nix delete mode 100644 pkgs/tools/networking/p2p/rtorrent/git.nix diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 421e0b205db..659d372418e 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig +, libtool, autoconf, automake, cppunit +, openssl, libsigcxx, zlib }: stdenv.mkDerivation rec { name = "libtorrent-${version}"; version = "0.13.6"; - src = fetchurl { - url = "http://rtorrent.net/downloads/${name}.tar.gz"; - sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18"; + src = fetchFromGitHub rec { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "${version}"; + sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp"; }; - buildInputs = [ pkgconfig openssl libsigcxx zlib ]; + buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = https://github.com/rakshasa/libtorrent/; + homepage = src.homepage; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry ]; + maintainers = with maintainers; [ simons ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix deleted file mode 100644 index e187a96dc0a..00000000000 --- a/pkgs/tools/networking/p2p/libtorrent/git.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: - -stdenv.mkDerivation { - name = "libtorrent-git-2014-08-20"; - - src = fetchFromGitHub rec { - owner = "rakshasa"; - repo = "libtorrent"; - rev = "c60d2b9475804e41649356fa0301e9f770798f8d"; - sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577"; - }; - - buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ]; - - configureFlags = "--disable-dependency-tracking --enable-aligned"; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with stdenv.lib; { - homepage = "http://libtorrent.rakshasa.no/"; - description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index ccb004ffb8c..658f3c4dae5 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,30 +1,50 @@ -{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig +, libtool, autoconf, automake, cppunit +, libtorrent, ncurses, libsigcxx, curl , zlib, openssl, xmlrpc_c + +# This no longer works +, colorSupport ? false }: stdenv.mkDerivation rec { name = "rtorrent-${version}"; version = "0.9.6"; - src = fetchurl { - url = "http://rtorrent.net/downloads/${name}.tar.gz"; - sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y"; + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "${version}"; + sha256 = "0iyxmjr1984vs7hrnxkfwgrgckacqml0kv4bhj185w9bhjqvgfnf"; }; - buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ]; + buildInputs = [ + pkgconfig libtool autoconf automake cppunit + libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c + ]; + + # Optional patch adds support for custom configurable colors + # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md + patches = stdenv.lib.optional colorSupport (fetchurl { + url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; + sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; + }); + + preConfigure = "./autogen.sh"; + configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ]; - # postInstall = '' - # mkdir -p $out/share/man/man1 $out/share/rtorrent - # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - # ''; + postInstall = '' + mkdir -p $out/share/man/man1 $out/share/doc/rtorrent + mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 + mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + ''; meta = with stdenv.lib; { - homepage = https://github.com/rakshasa/rtorrent/; + homepage = src.homepage; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry ]; + maintainers = with maintainers; [ simons ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix deleted file mode 100644 index dcdd2e68e15..00000000000 --- a/pkgs/tools/networking/p2p/rtorrent/git.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, autoconf, automake, cppunit, curl, fetchFromGitHub -, fetchurl, libsigcxx, libtool, libtorrent-git, ncurses, openssl -, pkgconfig, zlib, xmlrpc_c -, colorSupport ? false -}: - -# NOTICE: changes since 0.9.4 break the current configuration syntax, an -# example configuration file using the latest changes can be found at -# https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc - -stdenv.mkDerivation { - name = "rtorrent-git-2014-07-02"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = "rtorrent"; - rev = "7537a3c2a91d0915f1c4c89b01cd583629dc5fd4"; - sha256 = "1xnyjjff575jfq9c542yq3rr9q03z5x6xbg84d000wkjphbq7h7q"; - }; - - buildInputs = [ - autoconf - automake - cppunit - libtorrent-git - ncurses - pkgconfig - libsigcxx - libtool - curl - zlib - openssl - xmlrpc_c - ]; - - configureFlags = "--with-xmlrpc-c"; - - # Optional patch adds support for custom configurable colors - # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md - - patches = stdenv.lib.optional colorSupport (fetchurl { - url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; - sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; - }); - - preConfigure = '' - ./autogen.sh - ''; - - # postInstall = '' - # mkdir -p $out/share/man/man1 $out/share/rtorrent - # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - # ''; - - meta = with stdenv.lib; { - homepage = "http://libtorrent.rakshasa.no/"; - description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e0a94fbd60..bbb6202b396 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2136,8 +2136,6 @@ let libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; - libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; - libiberty = callPackage ../development/libraries/libiberty { }; libibverbs = callPackage ../development/libraries/libibverbs { }; @@ -2931,8 +2929,6 @@ let rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; - rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; - rubber = callPackage ../tools/typesetting/rubber { }; rxp = callPackage ../tools/text/xml/rxp { }; From 5729cf7714d41f1e4a37c9b685683a033c61ed8d Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Mon, 7 Dec 2015 13:21:25 -0500 Subject: [PATCH 098/498] mariadb: 10.1.8 -> 10.1.9 Fixes build on darwin; might be related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777996;msg=2 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1f281d9d72e..eb132a0be22 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.1.8"; + version = "10.1.9"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1yiv0161rkgll1yd9r1cb1wdx55rwynj8i623p6wjvda9536mgvw"; + sha256 = "0471vwg9c5c17m7679krjha16ib6d48fcsphkchb9v9cf8k5i74f"; }; buildInputs = [ From f4c01fc004dfb10d5d2a3988d7ddb199a0aa11e8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:30:18 +0100 Subject: [PATCH 099/498] systemd: enable timedated, hostnamed, localed. --- nixos/modules/system/boot/systemd.nix | 6 ++++++ pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d145baeebe9..826368e711a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -148,6 +148,12 @@ let # Misc. "systemd-sysctl.service" + "dbus-org.freedesktop.timedate1.service" + "dbus-org.freedesktop.locale1.service" + "dbus-org.freedesktop.hostname1.service" + "systemd-timedated.service" + "systemd-localed.service" + "systemd-hostnamed.service" ] ++ cfg.additionalUpstreamSystemUnits; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a78f51ddb36..234c60a37f2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { "--enable-compat-libs" # get rid of this eventually "--disable-tests" - "--disable-hostnamed" + "--enable-hostnamed" "--enable-networkd" "--disable-sysusers" - "--disable-timedated" + "--enable-timedated" "--enable-timesyncd" "--disable-firstboot" - "--disable-localed" + "--enable-localed" "--enable-resolved" "--disable-split-usr" "--disable-libcurl" From 1da87d40628c99081bac0a5d8b32c27123889826 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Dec 2015 20:24:02 +0100 Subject: [PATCH 100/498] systemd: Update to 228 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 234c60a37f2..35bd117f0bb 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -12,14 +12,14 @@ assert stdenv.isLinux; assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { - version = "227"; + version = "228"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "7d94d27801d20278103d8c146633fe81e06697d6"; - sha256 = "0cvzsrazqgbia3zajb0z4ik8myfil4bdy2c29qs6w93d6yvrjfkj"; + rev = "17c30663f79499ad0163c7ffe2c79e5c28525a6f"; + sha256 = "0jyqwqyh7l2qp7k4h83gzzp9bgijz0bx02jhd0063jcl1s2amlnh"; }; outputs = [ "out" "man" "doc" ]; From ca659e0e89d3a8e548785fe10b30c4583403ec4c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 6 Dec 2015 18:13:31 +0100 Subject: [PATCH 101/498] i2p: 0.9.22 -> 0.9.23 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 5b439eb8f3f..0829fed1d5e 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { - name = "i2p-0.9.22"; + name = "i2p-0.9.23"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0y21dx5d95gq1i6ip56nmawr19974zawzwa315dm8lmz32bj8g6n"; + sha256 = "1vjyki86r6v8z2pil7s6r74yf6h8w000ypxxngimw3kfff121swp"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From be80ba2c961b97b9991a05187bfc49f1f4d84282 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 7 Dec 2015 22:11:04 +0100 Subject: [PATCH 102/498] wine unstable: 1.8-rc2 -> 1.8-rc3 --- pkgs/misc/emulators/wine/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index bb874f31503..bfdbd0177da 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,7 +1,7 @@ { unstable = { - wineVersion = "1.8-rc2"; - wineSha256 = "0g7pk69mp9kjyd9hw64difqm5df12aqy8hiipxjrmwg044csqqvh"; + wineVersion = "1.8-rc3"; + wineSha256 = "0j65v0jr1z56p9g16c0412ssx44zif8gfna7a6m865wz8gs1fnm6"; geckoVersion = "2.40"; geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; gecko64Version = "2.40"; @@ -20,8 +20,8 @@ monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; }; staging = { - version = "1.8-rc2"; - sha256 = "1h2yq33nnylcmbnbwq54kxcdq9yzz8cbljkg8jz2skhi39vlcplp"; + version = "1.8-rc3"; + sha256 = "1jp91w4sn10ycd21rwqsgxmpr425r4in4d2g085dhiw6g57ixfnj"; }; winetricks = { version = "20151116"; From a0cdd4817172a2f9f50c7a70f6aea6c8355f6fc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Dec 2015 22:30:55 +0100 Subject: [PATCH 103/498] rtorrent: fix meta.homepage attribute --- pkgs/tools/networking/p2p/rtorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 658f3c4dae5..0d676795ab8 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = src.homepage; + inherit (src.meta) homepage; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; From b843e7c50a3e9793625c4ed5af890a58a9620074 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 7 Dec 2015 22:39:39 +0100 Subject: [PATCH 104/498] libtorrent: fix evaluation --- pkgs/tools/networking/p2p/libtorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 659d372418e..4f8c493a0f0 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = src.homepage; + homepage = http://www.libtorrent.org/; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; From 8111e1c9028fbc51a84b8ba8f96081f135c752bf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 6 Dec 2015 12:37:47 +0000 Subject: [PATCH 105/498] go: 1.5.1 -> 1.5.2, fixes #11498 --- pkgs/development/compilers/go/1.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index ce5c2579b89..30967ae2c15 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "1xd1nd1li7pdl72vq8zkh6m7ms3ajgyqz9a5d61gagm0cgj8zilz"; + sha256 = "1ggh5ll774an78yiij6xan67n38zglws0pxj36g0rcg84460h4m4"; }; # perl is used for testing go vet From 0c30a14b9d1e35481a94aeea68774a8f50edcba5 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 6 Dec 2015 18:13:11 +0100 Subject: [PATCH 106/498] dropbox: 3.10.11 -> 3.12.4 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index dc11c086f9f..7a615277d2c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -20,11 +20,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.10.11"; + version = "3.12.4"; sha256 = { - "x86_64-linux" = "1bs8bscg9sihpmcdrsi1y4128a03s82fwb4df459afx459i7ir82"; - "i686-linux" = "0cl868m303fsqv5ac8d8ygjywm6wgmirs60f35l1piv13cyj92ll"; + "x86_64-linux" = "0xq5gjqmrl4fn6vp7krj44jhb71npxvsjzbqb01whyyw7mdlc8gf"; + "i686-linux" = "093bfnak5xv50p9fxpr68w25hc1d08fcvrqnb4a6nb9wdfv3lkr6"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From a7aaedebcc823b8f576db34760c2f261bf837a5c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 6 Dec 2015 18:16:40 +0100 Subject: [PATCH 107/498] dropbox-cli: 2015.02.12 -> 2015.10.28, fixes #11538 --- pkgs/applications/networking/dropbox-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 6e7b6b6ac02..892d8fa3300 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "2015.02.12"; + version = "2015.10.28"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "12md01ymxsly1rdhdi2sw3aiwykd4y8z8isipc8mjfk8bbp55q86"; + sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; }; buildInputs = [ pkgconfig python ]; From 6945557dba4525c41bf3e6b04e0d588a4bbd8432 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Dec 2015 02:51:08 +0100 Subject: [PATCH 108/498] ruby: Fix SHA256 hashes of several versions. According to @zimbatm, he got the SHA256 hashes via nix-prefetch-git. However, fetchFromGitHub doesn't use Git to fetch the sources but uses fetchzip under the hood, so we get plain source directories in the Nix store, which in turn are hashed. Tested by: nix-build --no-out-link -E 'map (x: (builtins.getAttr x (import ./. {})).src ) [ "ruby_1_9_3" "ruby_2_0_0" "ruby_2_1_0" "ruby_2_1_1" "ruby_2_1_2" "ruby_2_1_3" "ruby_2_1_6" "ruby_2_1_7" "ruby_2_2_0" "ruby_2_2_2" "ruby_2_2_3" ]' Signed-off-by: aszlig --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2567db0736a..e5e17e142f4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -153,7 +153,7 @@ in { patchLevel = "647"; sha256 = { src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; - git = "bd9b6cc8ea984b38d245fb3be1b918ec677f29f394ede43bbf5cf00e88edd899"; + git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; }; }; @@ -219,7 +219,7 @@ in { patchLevel = "0"; sha256 = { src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; - git = "c5ecad94558547b6a50cf64d379829fecd62f3ca175626827f435237a3c6be5c"; + git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb"; }; }; @@ -252,7 +252,7 @@ in { patchLevel = "0"; sha256 = { src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; - git = "a62301ca31ef23c9ae88ca68c925df5c0cbf4319265befc3a2fa27a56213cb88"; + git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; }; }; } From 58ba1d5bd3e6e56c66c94c560f6fc3135834d899 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 4 Dec 2015 16:35:06 +0100 Subject: [PATCH 109/498] leiningen: 2.5.2 -> 2.5.3, fixes #11537 --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 70a6fac7bab..f4f18dac487 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.5.2"; + version = "2.5.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i"; + sha256 = "0xbfg6v6f3qyi99dbqragh3za2a0agrcq9c0qbkshvp5yd0fx4h1"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4"; + sha256 = "1p93j03v02mf1cnli6lv9qqnx7gwxr571g8z7y06p0d4nq31c32b"; }; patches = [ ./lein-fix-jar-path.patch ]; From dfb31c3262042fe29ca0ca38f9c1a7e333514322 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 8 Dec 2015 03:04:31 +0100 Subject: [PATCH 110/498] cassandra 2.1.11 -> 2.1.12 --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index a0500e899b4..cac8eb3fba8 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -11,8 +11,8 @@ let - version = "2.1.11"; - sha256 = "1jiikznjhyyh23xw02amzccr15c8wmz94yxah9qxagbfg9wn7j2j"; + version = "2.1.12"; + sha256 = "0ngibzw7lx2nppzsq5hn6adbkyzns6bnhsrkllqpimyjf27sjfq1"; in From 85c051b2f3d34377e8c574925d563fc2a356ce26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Dec 2015 02:34:09 +0000 Subject: [PATCH 111/498] kotlin: 1.0.0-beta-3594 -> 1.0.0-beta-3595 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 8c21fb9e263..e97309f9252 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip, which }: stdenv.mkDerivation rec { - version = "1.0.0-beta-3594"; + version = "1.0.0-beta-3595"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip"; - sha256 = "a633dc27bc9bc87174835ea47d5be8ec73e0a673bb46c4b9a5a784db95f3c733"; + sha256 = "1ed750a169a411349852a102d5a9c23aec656acb76d51018a4933741eb846fae"; }; propagatedBuildInputs = [ jre which ] ; From c00feace3984b779e5a2f8e89ac0d0822ecf74a8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 8 Dec 2015 03:48:46 +0100 Subject: [PATCH 112/498] linux-testing: 4.4.0-rc3 -> 4.4.0-rc4 Upstream changes can be found at: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc4 Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a9cb410487..5006f0519eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc3"; - modDirVersion = "4.4.0-rc3"; + version = "4.4-rc4"; + modDirVersion = "4.4.0-rc4"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1c45bjclz5y039nqwrfil8yzv108r6vvbjfrq7dpz64iyf7iqnv4"; + sha256 = "040ddm61rifscssnycd1lq9bfni3yrsdrrgg172rb9h5d7ya6981"; }; features.iwlwifi = true; From 124e70a459fc978c9000c05d0402ab936e8ea46b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 8 Dec 2015 03:46:38 +0100 Subject: [PATCH 113/498] python27: 2.7.10 -> 2.7.11 --- pkgs/development/interpreters/python/2.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index f624bd5d85e..a2c059da060 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.10"; + version = "${majorVersion}.11"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"; + sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"; }; patches = From 7e2a828fd6b2eec4d35a1ff849868b9ac6defbba Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 8 Dec 2015 03:47:06 +0100 Subject: [PATCH 114/498] python35: 3.5.0 -> 3.5.1 --- pkgs/development/interpreters/python/3.5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 2d85a52a2e9..0f4b6e744ac 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -23,7 +23,7 @@ with stdenv.lib; let majorVersion = "3.5"; pythonVersion = majorVersion; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn"; + sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; From 80720501cb130978bef9022fdf5b977f90b34d93 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Tue, 8 Dec 2015 11:11:14 +0100 Subject: [PATCH 115/498] ddclient: fix ssl option --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5802d8b95b3..ee06dfbbca3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,7 +18,7 @@ let password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} server=${config.services.ddclient.server} - ssl=${if config.services.ddclient.ssl then "yes" else "yes"} + ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} From 5a26cfc27f31400f5abf5ba01a904b4d90b9b804 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Tue, 8 Dec 2015 12:02:51 +0100 Subject: [PATCH 116/498] python tilestache: init at 1.50.1 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c45c0c4061..45b8aec62fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17019,6 +17019,27 @@ in modules // { }; }; + tilestache = self.buildPythonPackage rec { + name = "tilestache-${version}"; + version = "1.50.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/T/TileStache/TileStache-${version}.tar.gz"; + sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj"; + }; + + disabled = !isPy27; + + propagatedBuildInputs = with self; + [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; + + meta = { + description = "A tile server for rendered geographic data"; + homepage = http://tilestache.org; + license = licenses.bsd3; + }; + }; + timelib = buildPythonPackage rec { name = "timelib-0.2.4"; From 868a813368cc77daff3b7b8592e29ac33d85e37d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Dec 2015 06:21:36 -0600 Subject: [PATCH 117/498] kdelibs: disable UPnP kdelibs' UPnP implementation is unsupported upstream: https://lists.ubuntu.com/archives/kubuntu-devel/2014-February/007891.html --- pkgs/applications/kde-apps-15.08/kdelibs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix index 18d51e94d7c..a30b19774f2 100644 --- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix +++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix @@ -1,5 +1,5 @@ { kdeApp, attica, attr, automoc4, avahi, bison, cmake -, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase +, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info , soprano, strigi, udev, xz @@ -10,7 +10,7 @@ kdeApp { name = "kdelibs"; buildInputs = [ - attica attr avahi giflib herqq libdbusmenu_qt libjpeg libxml2 + attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 polkit_qt4 qca2 shared_desktop_ontologies udev xz ]; propagatedBuildInputs = [ qt4 soprano phonon strigi ]; @@ -30,7 +30,6 @@ kdeApp { cmakeFlags = [ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" "-DKDE_DEFAULT_HOME=.kde" ]; From a044b590fcc77f9272ed4de227a79f0470841e5e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:10:40 +0100 Subject: [PATCH 118/498] mcomix: use pillow instead of pil --- pkgs/applications/graphics/mcomix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 5c22854512a..069a4bace28 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pygtk, pil, python27Packages }: +{ stdenv, fetchurl, buildPythonPackage, python27Packages }: buildPythonPackage rec { namePrefix = ""; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0k3pqbvk08kb1nr0qldaj9bc7ca6rvcycgfi2n7gqmsirq5kscys"; }; - pythonPath = [ pygtk pil python27Packages.sqlite3 ]; + propagatedBuildInputs = with python27Packages; [ pygtk pillow sqlite3 ]; meta = { description = "Image viewer designed to handle comic books"; From 60e2dced1a698e5d918c4b6a91778fdf5cb23c20 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:11:00 +0100 Subject: [PATCH 119/498] mirage: use pillow instead of pil --- pkgs/applications/graphics/mirage/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 20f7460f7a1..c4b14388d1b 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pil, libX11, gettext }: +{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: buildPythonPackage rec { namePrefix = ""; @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py ''; - pythonPath = [ pygtk pil ]; + propagatedBuildInputs = [ pygtk pillow ]; meta = { description = "Simple image viewer written in PyGTK"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe50da49b0e..eefd5e96f08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12371,7 +12371,10 @@ let mimms = callPackage ../applications/audio/mimms {}; - mirage = callPackage ../applications/graphics/mirage {}; + mirage = callPackage ../applications/graphics/mirage { + inherit (pythonPackages) pygtk; + inherit (pythonPackages) pillow; + }; mixxx = callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; From c709363e2365de8c07c47056b1a0efa7189dd215 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:11:49 +0100 Subject: [PATCH 120/498] python mwlib: use pillow instead of pil --- pkgs/top-level/python-packages.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9247fc4404..8621a8a8f11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5083,7 +5083,7 @@ in modules // { sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7"; }; - commonDeps = with self; + propagatedBuildInputs = with self; [ apipkg bottle @@ -5099,19 +5099,7 @@ in modules // { simplejson sqlite3dbm timelib - ]; - - pythonPath = commonDeps ++ - [ - modules.sqlite3 - ]; - - propagatedBuildInputs = commonDeps; - - buildInputs = with self; - [ - pil - ] ++ propagatedBuildInputs; + ] ++ optionals (!isPy3k) [ modules.sqlite3 ]; meta = { description = "Library for parsing MediaWiki articles and converting them to different output formats"; From 0c57716ab9348d273f11dc413e82d6ae7a088cf2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:12:17 +0100 Subject: [PATCH 121/498] impressive: use pillow instead of pil --- pkgs/applications/office/impressive/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 8cc7e9b3253..75fdc703ec9 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python, makeWrapper, lib -, xpdf, pil, pyopengl, pygame +, xpdf, pillow, pyopengl, pygame , setuptools, mesa, freeglut }: let version = "0.10.5"; @@ -17,7 +17,7 @@ in # Note: We need to have `setuptools' in the path to be able to use # PyOpenGL. - buildInputs = [ makeWrapper xpdf pil pyopengl pygame ]; + buildInputs = [ makeWrapper xpdf pillow pyopengl pygame ]; configurePhase = '' sed -i "impressive.py" \ @@ -44,7 +44,7 @@ in ${lib.concatStringsSep ":" (map (path: path + "/lib/${python.libPrefix}/site-packages") - [ pil pyopengl pygame setuptools ])} \ + [ pillow pyopengl pygame setuptools ])} \ --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eefd5e96f08..648162b0cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12082,6 +12082,7 @@ let impressive = callPackage ../applications/office/impressive { # XXX These are the PyOpenGL dependencies, which we need here. inherit (pythonPackages) pyopengl; + inherit (pythonPackages) pillow; }; inferno = callPackage_i686 ../applications/inferno { }; From d9758cf3b4f0cdf479c4bf591b5fd05611e9ef5e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:12:53 +0100 Subject: [PATCH 122/498] calibre: use pillow instead of pil --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a967285c941..950d7032882 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp +, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt5.base chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw From 47dc242b9db1ff5a6c28459770a5191269a46274 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:14:45 +0100 Subject: [PATCH 123/498] pdfread: broken, not found --- pkgs/tools/graphics/pdfread/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index f35553ea168..3074b229c55 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ unzip python makeWrapper ]; + broken = true; # Not found. + phases = "unpackPhase patchPhase installPhase"; unpackPhase = '' From 4bcfa144802b0003bf64a5378ccb6297e87d7997 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:14:59 +0100 Subject: [PATCH 124/498] pdfread: use pillow instead of pil --- pkgs/tools/graphics/pdfread/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 3074b229c55..69ab7f27e34 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre +{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre , optipng, unrar}: stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $PYDIR cp -R *.py pylrs $PYDIR - wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ + wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648162b0cf0..ccf0241cee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2671,7 +2671,9 @@ let jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - pdfread = callPackage ../tools/graphics/pdfread { }; + pdfread = callPackage ../tools/graphics/pdfread { + inherit (pythonPackages) pillow; + }; briss = callPackage ../tools/graphics/briss { }; From 9cc4bb7f4ca71da3b57014ba58404ba69a3bce9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:15:14 +0100 Subject: [PATCH 125/498] xpra: use pillow instead of pil --- pkgs/tools/X11/xpra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 5ef80e887cf..b1fdd96adb5 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages , python, cython, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo +, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config -, ffmpeg, x264, libvpx, pil, libwebp +, ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: buildPythonPackage rec { @@ -29,8 +29,8 @@ buildPythonPackage rec { makeWrapper ]; - propagatedBuildInputs = [ - pil pygtk pygobject pythonPackages.rencode + propagatedBuildInputs = with pythonPackages; [ + pillow pygtk pygobject ]; postPatch = '' From 8d18e4c9f8387ee65ed85af3db59ff0dec513225 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:21:41 +0100 Subject: [PATCH 126/498] tpm thePenguinPachine: use pillow instead of pil Was already broken, and still is. --- pkgs/games/thePenguinMachine/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 479004a9af4..934b712fe12 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pil, pygame, SDL} @ args: with args; +{stdenv, fetchurl, python, pillow, pygame, SDL} @ args: with args; stdenv.mkDerivation { name = "thePenguinMachine"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { broken = true; # Not found - buildInputs = [python pil pygame SDL]; + buildInputs = [python pillow pygame SDL]; configurePhase = '' sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py; @@ -32,9 +32,9 @@ stdenv.mkDerivation { cp -r . "$out"/share/tpm/build-dir mkdir -p "$out/bin" echo "#! /bin/sh" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" + echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" + echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "${python}/bin/python \"$out\"/share/tpm/build-dir/ThePenguinMachine.py \"\$@\"" >> "$out/bin/tpm" chmod a+x "$out/bin/tpm" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccf0241cee5..dd2f0130e88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14223,7 +14223,9 @@ let tome4 = callPackage ../games/tome4 { }; - tpm = callPackage ../games/thePenguinMachine { }; + tpm = callPackage ../games/thePenguinMachine { + inherit (pythonPackages) pillow; + }; trackballs = callPackage ../games/trackballs { debug = false; From 6c7af844498f5dd8da81fd3e6374ecfce6f17ae8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:32:17 +0100 Subject: [PATCH 127/498] tpm thePenguinMachine: add comment about possible source --- pkgs/games/thePenguinMachine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 934b712fe12..6829c084ce9 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -6,6 +6,9 @@ stdenv.mkDerivation { url = http://www.migniot.com/matrix/projects/thepenguinmachine/ThePenguinMachine.tar.gz; sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv"; }; + # Perhaps the following source works? See http://tpm.seul.org/ + # url = http://tpm.seul.org/TPM.tar.bz2; + # sha256 = "8fc2f2961a54005cd7f349dd859823addf05b01d0e3b3e83928b5b75460930fa"; broken = true; # Not found From 459a5c5803206070a7256644da25526043c01327 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 17:45:44 +0300 Subject: [PATCH 128/498] nethack: 3.4.3 -> 3.6.0 I think a decade has passed ^_^ --- pkgs/games/nethack/default.nix | 78 ++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index e5057c27e99..d3a510e2952 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,60 +1,76 @@ -{ stdenv, fetchurl, writeScript, ncurses, gzip, flex, bison }: +{ stdenv, lib, fetchurl, writeScript, ncurses, gzip, flex, bison }: -stdenv.mkDerivation rec { - name = "nethack-3.4.3"; +let + platform = + if lib.elem stdenv.system lib.platforms.unix then "unix" + else abort "Unknown platform for NetHack"; + unixHint = + if stdenv.isLinux then "linux" + # We probably want something different for Darwin + else "unix"; + userDir = "~/.local/nethack"; + +in stdenv.mkDerivation { + name = "nethack-3.6.0"; src = fetchurl { - url = "mirror://sourceforge/nethack/nethack-343-src.tgz"; - sha256 = "1r3ghqj82j0bar62z3b0lx9hhx33pj7p1ppxr2hg8bgfm79c6fdv"; + url = "mirror://sourceforge/nethack/nethack-360-src.tgz"; + sha256 = "12mi5kgqw3q029y57pkg3gnp930p7yvlqi118xxdif2qhj6nkphs"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ flex bison ]; - preBuild = '' - ( cd sys/unix ; sh setup.sh ) + makeFlags = [ "PREFIX=$(out)" ]; + + configurePhase = '' + cd sys/${platform} + ${lib.optionalString (platform == "unix") '' + sed -e '/^ *cd /d' -i nethack.sh + ${lib.optionalString (unixHint == "linux") '' + sed \ + -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ + -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ + -i hints/linux + ''} + sh setup.sh hints/${unixHint} + ''} + cd ../.. - sed -e '/define COMPRESS/d' -i include/config.h - sed -e '1i\#define COMPRESS "${gzip}/bin/gzip"' -i include/config.h - sed -e '1i\#define COMPRESS_EXTENSION ".gz"' -i include/config.h sed -e '/define CHDIR/d' -i include/config.h - - sed -e '/extern char [*]tparm/d' -i win/tty/*.c - - sed -e 's/-ltermlib/-lncurses/' -i src/Makefile - sed -e 's/^YACC *=.*/YACC = bison -y/' -i util/Makefile - sed -e 's/^LEX *=.*/LEX = flex/' -i util/Makefile - - sed -re 's@^(CH...).*@\1 = true@' -i Makefile - - sed -e '/^ *cd /d' -i sys/unix/nethack.sh + sed \ + -e 's/^YACC *=.*/YACC = bison -y/' \ + -e 's/^LEX *=.*/LEX = flex/' \ + -i util/Makefile ''; postInstall = '' + mkdir -p $out/games/lib/nethackuserdir for i in logfile perm record save; do - rm -rf $out/games/lib/nethackdir/$i + mv $out/games/lib/nethackdir/$i $out/games/lib/nethackuserdir done mkdir -p $out/bin cat <$out/bin/nethack #! ${stdenv.shell} -e - if [ ! -d ~/.nethack ]; then - mkdir -p ~/.nethack/save - for i in logfile perm record; do - [ ! -e ~/.nethack/\$i ] && touch ~/.nethack/\$i - done + if [ ! -d ${userDir} ]; then + mkdir -p ${userDir} + cp -r $out/games/lib/nethackuserdir/* ${userDir} + chmod -R +w ${userDir} fi - cd ~/.nethack + RUNDIR=$(mktemp -d nethack) cleanup() { - for i in $out/games/lib/nethackdir/*; do - rm -rf \$(basename \$i) - done + rm -rf $RUNDIR } trap cleanup EXIT + cd $RUNDIR + for i in ${userDir}/*; do + ln -s \$i \$(basename \$i) + done for i in $out/games/lib/nethackdir/*; do ln -s \$i \$(basename \$i) done @@ -63,8 +79,6 @@ stdenv.mkDerivation rec { chmod +x $out/bin/nethack ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Rogue-like game"; homepage = "http://nethack.org/"; From b6c9ce9b038bf5af6e6a6bed791efbb32d2edb3f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 18:10:53 +0300 Subject: [PATCH 129/498] nethack: fix the last-minute fix --- pkgs/games/nethack/default.nix | 41 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index d3a510e2952..05c39fb2f2b 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -8,7 +8,7 @@ let if stdenv.isLinux then "linux" # We probably want something different for Darwin else "unix"; - userDir = "~/.local/nethack"; + userDir = "~/.config/nethack"; in stdenv.mkDerivation { name = "nethack-3.6.0"; @@ -53,28 +53,29 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat <$out/bin/nethack - #! ${stdenv.shell} -e - if [ ! -d ${userDir} ]; then - mkdir -p ${userDir} - cp -r $out/games/lib/nethackuserdir/* ${userDir} - chmod -R +w ${userDir} - fi + #! ${stdenv.shell} -e - RUNDIR=$(mktemp -d nethack) + if [ ! -d ${userDir} ]; then + mkdir -p ${userDir} + cp -r $out/games/lib/nethackuserdir/* ${userDir} + chmod -R +w ${userDir} + fi - cleanup() { - rm -rf $RUNDIR - } - trap cleanup EXIT + RUNDIR=\$(mktemp -td nethack.\$USER.XXXXX) - cd $RUNDIR - for i in ${userDir}/*; do - ln -s \$i \$(basename \$i) - done - for i in $out/games/lib/nethackdir/*; do - ln -s \$i \$(basename \$i) - done - $out/games/nethack + cleanup() { + rm -rf \$RUNDIR + } + trap cleanup EXIT + + cd \$RUNDIR + for i in ${userDir}/*; do + ln -s \$i \$(basename \$i) + done + for i in $out/games/lib/nethackdir/*; do + ln -s \$i \$(basename \$i) + done + $out/games/nethack EOF chmod +x $out/bin/nethack ''; From e8c55a06e2ee852d77595f4523ca25e8fde5b8d8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 8 Dec 2015 16:22:16 +0100 Subject: [PATCH 130/498] imv: 1.0.0 -> 1.1.0 --- pkgs/applications/graphics/imv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 462f657f2a7..9298c764d28 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "imv-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; - rev = "f2ce793d628e88825eff3364b293104cb0bdb582"; - sha256 = "1xqaqbfjgksbjmy1yy7q4sv5bak7w8va60xa426jzscy9cib2sgh"; + rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb"; + sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r"; }; buildInputs = [ SDL2 freeimage ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; homepage = https://github.com/eXeC64/imv; - license = licenses.mit; + license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; }; From e0fe879562b8b3f0bc6f96e0bf6d7e1c34b26231 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Mon, 7 Dec 2015 20:42:33 -0800 Subject: [PATCH 131/498] corkscrew: init at 2.0 --- pkgs/tools/networking/corkscrew/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/tools/networking/corkscrew/default.nix diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix new file mode 100644 index 00000000000..96747e82cee --- /dev/null +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "corkscrew-2.0"; + + src = fetchurl { + url = "http://agroman.net/corkscrew/${name}.tar.gz"; + sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; + }; + + meta = with stdenv.lib; { + homepage = http://agroman.net/corkscrew/; + description = "A tool for tunneling SSH through HTTP proxies"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1de5a542d3e..986004c5642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1159,6 +1159,8 @@ let coreutils-prefixed = coreutils.override { withPrefix = true; }; + corkscrew = callPackage ../tools/networking/corkscrew { }; + cpio = callPackage ../tools/archivers/cpio { }; crackxls = callPackage ../tools/security/crackxls { }; From e1f2ddefd93a2064aedc7952654ecddba93ed524 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 15:49:28 +0100 Subject: [PATCH 132/498] tpm thePenguinMachine: remove package because source is unavailable --- pkgs/games/thePenguinMachine/default.nix | 48 ------------------------ pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 52 deletions(-) delete mode 100644 pkgs/games/thePenguinMachine/default.nix diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix deleted file mode 100644 index 6829c084ce9..00000000000 --- a/pkgs/games/thePenguinMachine/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{stdenv, fetchurl, python, pillow, pygame, SDL} @ args: with args; -stdenv.mkDerivation { - name = "thePenguinMachine"; - - src = fetchurl { - url = http://www.migniot.com/matrix/projects/thepenguinmachine/ThePenguinMachine.tar.gz; - sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv"; - }; - # Perhaps the following source works? See http://tpm.seul.org/ - # url = http://tpm.seul.org/TPM.tar.bz2; - # sha256 = "8fc2f2961a54005cd7f349dd859823addf05b01d0e3b3e83928b5b75460930fa"; - - broken = true; # Not found - - buildInputs = [python pillow pygame SDL]; - - configurePhase = '' - sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py; - sed -e "/includes = /aincludes.append('$(echo ${pygame}/include/python*)')" -i setup.py; - cat setup.py; - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; - buildPhase = '' - sed -e "s/pygame.display.toggle_fullscreen.*/pass;/" -i tpm/Application.py - sed -e 's@"Surface"@"pygame.Surface"@' -i src/surfutils.c - python setup.py build; - python setup.py build_clib; - python setup.py build_ext; - python setup.py build_py; - python setup.py build_scripts; - ''; - installPhase = '' - python setup.py install --prefix=$out - mkdir -p "$out"/share/tpm/ - cp -r . "$out"/share/tpm/build-dir - mkdir -p "$out/bin" - echo "#! /bin/sh" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" - echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" - echo "${python}/bin/python \"$out\"/share/tpm/build-dir/ThePenguinMachine.py \"\$@\"" >> "$out/bin/tpm" - chmod a+x "$out/bin/tpm" - ''; - - meta = { - description = "An Incredible Machine clone"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2f0130e88..f8239976410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14223,10 +14223,6 @@ let tome4 = callPackage ../games/tome4 { }; - tpm = callPackage ../games/thePenguinMachine { - inherit (pythonPackages) pillow; - }; - trackballs = callPackage ../games/trackballs { debug = false; guile = guile_1_8; From 9455476f47cf01095747c36b42777f9d9d1dc525 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 16:00:51 +0100 Subject: [PATCH 133/498] tribler: use pillow instead of pil Program opens. Didn't test any further. --- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index a96d0f9cc67..b2a578ddc1d 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pythonPackages.twisted pythonPackages.gmpy pythonPackages.netifaces - pythonPackages.pil + pythonPackages.pillow pythonPackages.pycrypto pythonPackages.pyasn1 pythonPackages.requests From 91adf1bb65a95e1ecb47e4fa4bbd7f8d969cdc48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 16:07:29 +0100 Subject: [PATCH 134/498] python: remove PIL Remove it once and for all. --- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 44 ------------------------------ 2 files changed, 46 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8239976410..808a9f4b527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,8 +8981,6 @@ let numeric = callPackage ../development/python-modules/numeric { }; - pil = pythonPackages.pil; - psyco = callPackage ../development/python-modules/psyco { }; pycairo = pythonPackages.pycairo; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8621a8a8f11..ee435153703 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13212,50 +13212,6 @@ in modules // { }; }; - - pil = buildPythonPackage rec { - name = "PIL-${version}"; - version = "1.1.7"; - - src = pkgs.fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; - }; - - buildInputs = with self; [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; - - disabled = isPy3k; - - postInstall = "ln -s $out/${python.sitePackages} $out/${python.sitePackages}/PIL"; - - preConfigure = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - - checkPhase = "${python.interpreter} selftest.py"; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - }; - }; - - pillow = buildPythonPackage rec { name = "Pillow-2.9.0"; From ca3b47cccc2c2acfd8b3027175f637c0e36f250a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 18:54:02 +0300 Subject: [PATCH 135/498] release-notes: mention bumblebee changes --- nixos/doc/manual/release-notes/rl-unstable.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c9b31afdfcf..cf6e4ace413 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -104,6 +104,15 @@ nginx.override { You can (still) use the html-tidy package, which got updated to a stable release from this new upstream. + + + extraDeviceOptions argument is removed + from bumblebee package. Instead there are + now two separate arguments: extraNvidiaDeviceOptions + and extraNouveauDeviceOptions for setting + extra X11 options for nvidia and nouveau drivers, respectively. + + From c3be340ae0b63dbd167dfe998d17944b7dd2d1ed Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 8 Dec 2015 16:48:30 +0100 Subject: [PATCH 136/498] handbrake: fix compilation due to missing dep --- pkgs/applications/video/handbrake/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index be10cc7744a..d0cd82039f2 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -22,7 +22,7 @@ mp4v2, mpeg2dec, x264, libmkv, fontconfig, freetype, glib, gtk, webkitgtk, intltool, libnotify, - gst_all_1, dbus_glib, udev, + gst_all_1, dbus_glib, udev, libgudev, useGtk ? true, useWebKitGtk ? false # This prevents ghb from starting in my tests }: @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputsX = stdenv.lib.optionals useGtk [ glib gtk intltool libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + libgudev ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ]; # Did not test compiling with it From 30bf5a01ad541ce8869115fedcf498530da49245 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 8 Dec 2015 19:11:43 +0100 Subject: [PATCH 137/498] Fix maintainer list format and improve vanity.sh reliability --- lib/maintainers.nix | 2 +- maintainers/scripts/vanity.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e6947bf804c..596b8a49a10 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -182,7 +182,7 @@ malyn = "Michael Alyn Miller "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; - markWot = "Markus Wotringer ] *".*/\1\t\2\t\3/')" + s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" git_lines="$( ( echo "$git_data"; cat "$(dirname "$0")/vanity-manual-equalities.txt") | sort |uniq)" From 93d8671e2c6d1d25f126ed30e5e6f16764330119 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 8 Dec 2015 20:14:33 +0100 Subject: [PATCH 138/498] nixos/rabbitmq: fix link to documentation --- nixos/modules/services/amqp/rabbitmq.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 780d5daded9..61545a5acba 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -65,7 +65,7 @@ in { type = types.str; description = '' Verbatim configuration file contents. - See http://www.rabbitmq.com/configure.htm + See http://www.rabbitmq.com/configure.html ''; }; From c27de52d39b1963d0b13765db6a20d7c2f56e2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 8 Dec 2015 22:26:36 +0100 Subject: [PATCH 139/498] eagle: 6.6.0 -> 7.5.0 * It grew a couple of extra (hard) dependencies: libxcb, cups, xkeyboardconfig * It is also available in native 64-bit version (yay!) --- .../science/electronics/eagle/default.nix | 23 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index da4894c11a8..71bc58af7c0 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -1,24 +1,34 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi +, libxcb, cups, xkeyboardconfig }: let libPath = stdenv.lib.makeLibraryPath [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 - libXext libXi + libXext libXi libxcb cups ]; in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "6.6.0"; + version = "7.5.0"; - src = fetchurl { - url = "ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-${version}.run"; - sha256 = "0m5289daah85b2rwpivnh2z1573v6j4alzjy9hg78fkb9jdgbn0x"; - }; + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run"; + sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run"; + sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9"; + } + else + throw "Unsupported system: ${stdenv.system}"; desktopItem = makeDesktopItem { name = "eagle"; @@ -65,6 +75,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" + export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" EOF chmod a+x "$out"/bin/eagle diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c45d8de4d8..9849d5728f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15001,7 +15001,7 @@ let ### SCIENCE / ELECTRONICS - eagle = callPackage_i686 ../applications/science/electronics/eagle { }; + eagle = callPackage ../applications/science/electronics/eagle { }; caneda = callPackage ../applications/science/electronics/caneda { }; From 2acf59efa45375c753bfc434e35d6bddf64f7816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 8 Dec 2015 22:52:02 +0100 Subject: [PATCH 140/498] nixos/redmine: improve assert message Give the user more context. --- nixos/modules/services/misc/redmine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index eb6575887d5..7c9483911f2 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -124,7 +124,7 @@ in { assertions = [ { assertion = cfg.databasePassword != ""; - message = "databasePassword must be set"; + message = "services.redmine.databasePassword must be set"; } ]; From fbcf7fcd33ebaa22b65d3f6949ff4b450be144f4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 8 Dec 2015 22:52:52 +0100 Subject: [PATCH 141/498] opkg: 0.3.0 -> 0.3.1 --- pkgs/tools/package-management/opkg/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 2a9d167cfcd..d89d4c58af3 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl }: +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl +, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.3.1"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "13wqai7lgyfjlqvly0bz786wk9frl16a9yzrn27p3wwfvcf5swvz"; + sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl ]; + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl + autoreconfHook ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; From 0a64071932ce1404c371d5b3b12eebb459a5356a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 8 Dec 2015 23:28:37 +0100 Subject: [PATCH 142/498] flashplayer: 11.2.202.540 -> 11.2.202.554 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5f790fc9cea..fbf8f95a388 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.540"; + version = "11.2.202.554"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0zya9n5h669wbna182ig6dl4yf5sv4lvqk19rqhcwv3i718b0ai6"; + sha256 = "15zziclffvsa0wpygkwzbh3v367n73pmzwsnkanhg75rv28dgl3x"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1n8ik5f257s388ql7gkmfh1iqil0g4kzxh3zsv2x8r6ssrvpq1by"; + sha256 = "1a26l6lz5l6qbx4lm7266pzk0zr77h6issbnayr6df9qj99bppyz"; } else throw "Flash Player is not supported on this platform"; From 29871ee2ddfb940b37ee697ce5d2e8ce85337305 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Tue, 8 Dec 2015 10:40:43 +0100 Subject: [PATCH 143/498] miniupnpd: add service --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/miniupnpd.nix | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 nixos/modules/services/networking/miniupnpd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9fc1d54bd84..744857c5901 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -312,6 +312,7 @@ ./services/networking/lambdabot.nix ./services/networking/mailpile.nix ./services/networking/minidlna.nix + ./services/networking/miniupnpd.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix ./services/networking/namecoind.nix diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix new file mode 100644 index 00000000000..e654eb80b17 --- /dev/null +++ b/nixos/modules/services/networking/miniupnpd.nix @@ -0,0 +1,70 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.miniupnpd; + configFile = pkgs.writeText "miniupnpd.conf" '' + ext_ifname=${cfg.externalInterface} + enable_natpmp=${if cfg.natpmp then "yes" else "no"} + enable_upnp=${if cfg.upnp then "yes" else "no"} + + ${concatMapStrings (range: '' + listening_ip=${range} + '') cfg.internalIPs} + + ${cfg.appendConfig} + ''; +in +{ + options = { + services.miniupnpd = { + enable = mkEnableOption "MiniUPnP daemon"; + + externalInterface = mkOption { + type = types.str; + description = '' + Name of the external interface. + ''; + }; + + internalIPs = mkOption { + type = types.listOf types.str; + example = [ "192.168.1.0/24" ]; + description = '' + The IP address ranges to listen on. + ''; + }; + + natpmp = mkEnableOption "NAT-PMP support"; + + upnp = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable UPNP support. + ''; + }; + + appendConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration lines appended to the MiniUPnP config. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.miniupnpd = { + description = "MiniUPnP daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.miniupnpd ]; + serviceConfig = { + ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -d -f ${configFile}"; + }; + }; + }; +} From 3ebbb328dbce4411e5c002240ad7a70cfc6fc300 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Dec 2015 18:57:51 -0600 Subject: [PATCH 144/498] kf516: wrap new programs --- .../libraries/kde-frameworks-5.16/kcoreaddons.nix | 7 +++++-- .../libraries/kde-frameworks-5.16/kdesignerplugin.nix | 7 +++++-- .../libraries/kde-frameworks-5.16/kiconthemes.nix | 8 ++++++-- pkgs/development/libraries/kde-frameworks-5.16/kio.nix | 1 + 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix index 43c21bb51ef..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix @@ -1,12 +1,15 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , shared_mime_info }: kdeFramework { name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix index 28df2415320..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , kcompletion , kconfig @@ -18,13 +18,16 @@ kdeFramework { name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix index 02b516afedc..eb24403169d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules, kconfigwidgets, ki18n , kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix index 0789828d812..199565e2418 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix @@ -23,6 +23,7 @@ kdeFramework { wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktrash5" wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; From 2838161c2107f350f75120cc0c61c4ebb8901052 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 9 Dec 2015 02:05:36 +0100 Subject: [PATCH 145/498] krename: use older version of taglib Fixes a build failure during the config phase. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9849d5728f8..7b0be9aa22e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14524,7 +14524,9 @@ let kvirc = callPackage ../applications/networking/irc/kvirc { }; - krename = callPackage ../applications/misc/krename { }; + krename = callPackage ../applications/misc/krename { + taglib = taglib_1_9; + }; krusader = callPackage ../applications/misc/krusader { }; From 985bd0808e5f0c43cd378ac4ba1fe51575a3bbd3 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Tue, 8 Dec 2015 10:59:48 +0100 Subject: [PATCH 146/498] syslinux: fix missing mtools dependency closes #11472 --- pkgs/os-specific/linux/syslinux/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 5ebcef39e47..c051aac4312 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid }: +{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { name = "syslinux-2015-11-09"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./perl-deps.patch ]; nativeBuildInputs = [ nasm perl python ]; - buildInputs = [ libuuid ]; + buildInputs = [ libuuid makeWrapper ]; enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { "bios" ]; + postInstall = '' + wrapProgram $out/bin/syslinux \ + --prefix PATH : "${mtools}/bin" + ''; + meta = with stdenv.lib; { homepage = http://www.syslinux.org/; description = "A lightweight bootloader"; From 6db67186f2ea8dd6cd5fb3a048dd9facd749c81a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Dec 2015 07:30:15 +0200 Subject: [PATCH 147/498] Azure image: package and add azure agent --- nixos/modules/virtualisation/azure-agent.nix | 170 ++++++++++++++++++ nixos/modules/virtualisation/azure-common.nix | 3 + 2 files changed, 173 insertions(+) create mode 100644 nixos/modules/virtualisation/azure-agent.nix diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix new file mode 100644 index 00000000000..e657cc51939 --- /dev/null +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.azure.agent; + + waagent = with pkgs; stdenv.mkDerivation rec { + name = "waagent-2.0"; + src = pkgs.fetchgit { + url = https://github.com/Phreedom/WALinuxAgent.git; + rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b"; + sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs"; + }; + buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; + runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh + nettools # for hostname + procps # for pidof + shadow # for useradd, usermod + utillinux # for (u)mount, fdisk, sfdisk, mkswap + parted + ]; + pythonPath = [ pythonPackages.pyasn1 ]; + + configurePhase = false; + buildPhase = false; + + installPhase = '' + substituteInPlace config/99-azure-product-uuid.rules \ + --replace /bin/chmod "${coreutils}/bin/chmod" + mkdir -p $out/lib/udev/rules.d + cp config/*.rules $out/lib/udev/rules.d + + mkdir -p $out/bin + cp waagent $out/bin/ + chmod +x $out/bin/waagent + + wrapProgram "$out/bin/waagent" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${makeSearchPath "bin" runtimeDeps}" + ''; + }; + + provisionedHook = pkgs.writeScript "provisioned-hook" '' + #!${pkgs.stdenv.shell} + ${config.systemd.package}/bin/systemctl start provisioned.target + ''; + +in + +{ + + ###### interface + + options.virtualisation.azure.agent.enable = mkOption { + default = false; + description = "Whether to enable the Windows Azure Linux Agent."; + }; + + ###### implementation + + config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; + message = "Azure not currently supported on ${pkgs.stdenv.system}"; + } { + assertion = config.networking.networkmanager.enable == false; + message = "Windows Azure Linux Agent is not compatible with NetworkManager"; + } ]; + + boot.initrd.kernelModules = [ "ata_piix" ]; + networking.firewall.allowedUDPPorts = [ 68 ]; + + + environment.etc."waagent.conf".text = '' + # + # Windows Azure Linux Agent Configuration + # + + Role.StateConsumer=${provisionedHook} + + # Enable instance creation + Provisioning.Enabled=y + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n + + # Generate fresh host key pair. + Provisioning.RegenerateSshHostKeyPair=y + + # Supported values are "rsa", "dsa" and "ecdsa". + Provisioning.SshHostKeyPairType=ed25519 + + # Monitor host name changes and publish changes via DHCP requests. + Provisioning.MonitorHostName=y + + # Decode CustomData from Base64. + Provisioning.DecodeCustomData=n + + # Execute CustomData after provisioning. + Provisioning.ExecuteCustomData=n + + # Format if unformatted. If 'n', resource disk will not be mounted. + ResourceDisk.Format=y + + # File system on the resource disk + # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. + ResourceDisk.Filesystem=ext4 + + # Mount point for the resource disk + ResourceDisk.MountPoint=/mnt/resource + + # Respond to load balancer probes if requested by Windows Azure. + LBProbeResponder=y + + # Enable logging to serial console (y|n) + # When stdout is not enough... + # 'y' if not set + Logs.Console=y + + # Enable verbose logging (y|n) + Logs.Verbose=n + + # Root device timeout in seconds. + OS.RootDeviceScsiTimeout=300 + ''; + + services.udev.packages = [ waagent ]; + + networking.dhcpcd.persistent = true; + + services.logrotate = { + enable = true; + config = '' + /var/log/waagent.log { + compress + monthly + rotate 6 + notifempty + missingok + } + ''; + }; + + systemd.targets.provisioned = { + description = "Services Requiring Azure VM provisioning to have finished"; + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + }; + + + systemd.services.waagent = { + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + after = [ "ip-up.target" ]; + wants = [ "ip-up.target" ]; + + path = [ pkgs.e2fsprogs ]; + description = "Windows Azure Agent Service"; + unitConfig.ConditionPathExists = "/etc/waagent.conf"; + serviceConfig = { + ExecStart = "${waagent}/bin/waagent -daemon"; + Type = "simple"; + }; + }; + + }; + +} diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 47022c6887c..eedf115ee15 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -4,6 +4,9 @@ with lib; { imports = [ ../profiles/headless.nix ]; + require = [ ./azure-agent.nix ]; + virtualisation.azure.agent.enable = true; + boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; From c16f90f515856bad037e579f131a5ea61ce6699f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Dec 2015 07:39:17 +0200 Subject: [PATCH 148/498] Azure image: update ssh key type, start before the Azure agent --- nixos/modules/virtualisation/azure-image.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 1013396c049..024be4a5116 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -98,8 +98,8 @@ in systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; - wantedBy = [ "sshd.service" ]; - before = [ "sshd.service" ]; + wantedBy = [ "sshd.service" "waagent.service" ]; + before = [ "sshd.service" "waagent.service" ]; after = [ "local-fs.target" ]; path = [ pkgs.coreutils ]; @@ -108,14 +108,14 @@ in eval "$(base64 --decode /metadata/CustomData.bin)" if ! [ -z "$ssh_host_ecdsa_key" ]; then echo "downloaded ssh_host_ecdsa_key" - echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ecdsa_key - chmod 600 /etc/ssh/ssh_host_ecdsa_key + echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key + chmod 600 /etc/ssh/ssh_host_ed25519_key fi if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then echo "downloaded ssh_host_ecdsa_key_pub" - echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ecdsa_key.pub - chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub + echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub + chmod 644 /etc/ssh/ssh_host_ed25519_key.pub fi if ! [ -z "$ssh_root_auth_key" ]; then From 8d3b318c42ac28997edb3f4a6875d36228328791 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 9 Dec 2015 00:48:15 -0800 Subject: [PATCH 149/498] closure-compiler: allow building on darwin Near as I can tell it works fine. --- pkgs/development/compilers/closure/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index e94cbeae37f..1c684c21bf4 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "A tool for making JavaScript download and run faster"; homepage = https://developers.google.com/closure/compiler/; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From d39f9e867466d1829f38a0fff7c31b94b057cd1a Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 17 Nov 2015 14:09:08 +0000 Subject: [PATCH 150/498] gsl: 1.16 -> 2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes : – gsl-2.0: https://savannah.gnu.org/forum/forum.php?forum_id=8392 — gsl-2.1: https://savannah.gnu.org/forum/forum.php?forum_id=8408 The bug-39055.patch is removed since it seems to be integrated in the 2.1 release. --- pkgs/development/libraries/gsl/default.nix | 9 ++--- pkgs/development/libraries/gsl/gsl-1_16.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++-- 3 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/gsl/gsl-1_16.nix diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index dbea97a0271..af6c91499ac 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,21 +1,16 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.16"; + name = "gsl-2.1"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; + sha256 = "0rhcia9jhr3p1f1wybwyllwqfs9bggz99i3mi5lpyqcpff1hdbar"; }; patches = [ # ToDo: there might be more impurities than FMA support check ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - (fetchpatch { - name = "bug-39055.patch"; - url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; - sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; - }) ]; doCheck = true; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix new file mode 100644 index 00000000000..dbea97a0271 --- /dev/null +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -0,0 +1,39 @@ +{ fetchurl, fetchpatch, stdenv }: + +stdenv.mkDerivation rec { + name = "gsl-1.16"; + + src = fetchurl { + url = "mirror://gnu/gsl/${name}.tar.gz"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; + }; + + patches = [ + # ToDo: there might be more impurities than FMA support check + ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html + (fetchpatch { + name = "bug-39055.patch"; + url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; + sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; + }) + ]; + + doCheck = true; + + meta = { + description = "The GNU Scientific Library, a large numerical library"; + homepage = http://www.gnu.org/software/gsl/; + license = stdenv.lib.licenses.gpl3Plus; + + longDescription = '' + The GNU Scientific Library (GSL) is a numerical library for C + and C++ programmers. It is free software under the GNU General + Public License. + + The library provides a wide range of mathematical routines such + as random number generators, special functions and least-squares + fitting. There are over 1000 functions in total with an + extensive test suite. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7c90e2d43c..51b097c0e12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -563,6 +563,7 @@ let asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; + gsl = gsl_1; }; atomicparsley = callPackage ../tools/video/atomicparsley { }; @@ -1995,7 +1996,7 @@ let kpcli = callPackage ../tools/security/kpcli { }; - kst = callPackage ../tools/graphics/kst { }; + kst = callPackage ../tools/graphics/kst { gsl = gsl_1; }; leocad = callPackage ../applications/graphics/leocad { }; @@ -6571,6 +6572,8 @@ let gsl = callPackage ../development/libraries/gsl { }; + gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; + gsm = callPackage ../development/libraries/gsm {}; gsoap = callPackage ../development/libraries/gsoap { }; @@ -12608,7 +12611,7 @@ let opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { }; + orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; }; osmo = callPackage ../applications/office/osmo { }; From 3a0a9f73fce15f1b496f9bb9f7eff160899e7261 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 06:30:02 -0600 Subject: [PATCH 151/498] plasma55: 5.4.95 -> 5.5.0 --- pkgs/desktops/plasma-5.5/fetchsrcs.sh | 2 +- pkgs/desktops/plasma-5.5/srcs.nix | 304 +++++++++++++------------- 2 files changed, 153 insertions(+), 153 deletions(-) diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh index e9b551f86b9..7ccb8e3a2e2 100755 --- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh +++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/unstable/plasma/5.4.95/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.5.0/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix index f8ff0be3f85..488f4de17ff 100644 --- a/pkgs/desktops/plasma-5.5/srcs.nix +++ b/pkgs/desktops/plasma-5.5/srcs.nix @@ -3,307 +3,307 @@ { bluedevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz"; - sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p"; - name = "bluedevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz"; + sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk"; + name = "bluedevil-5.5.0.tar.xz"; }; }; breeze = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz"; - sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr"; - name = "breeze-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz"; + sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p"; + name = "breeze-5.5.0.tar.xz"; }; }; breeze-gtk = { - version = "5.4.95"; + version = "5.5.0.1"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz"; - sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg"; - name = "breeze-gtk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz"; + sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n"; + name = "breeze-gtk-5.5.0.1.tar.xz"; }; }; discover = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz"; - sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz"; - name = "discover-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz"; + sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4"; + name = "discover-5.5.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz"; - sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3"; - name = "kde-cli-tools-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz"; + sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv"; + name = "kde-cli-tools-5.5.0.tar.xz"; }; }; kdecoration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz"; - sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3"; - name = "kdecoration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz"; + sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra"; + name = "kdecoration-5.5.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz"; - sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih"; - name = "kde-gtk-config-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz"; + sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a"; + name = "kde-gtk-config-5.5.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz"; - sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq"; - name = "kdeplasma-addons-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz"; + sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz"; + name = "kdeplasma-addons-5.5.0.tar.xz"; }; }; kgamma5 = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz"; - sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk"; - name = "kgamma5-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz"; + sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f"; + name = "kgamma5-5.5.0.tar.xz"; }; }; khelpcenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz"; - sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4"; - name = "khelpcenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz"; + sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09"; + name = "khelpcenter-5.5.0.tar.xz"; }; }; khotkeys = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz"; - sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv"; - name = "khotkeys-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz"; + sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl"; + name = "khotkeys-5.5.0.tar.xz"; }; }; kinfocenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz"; - sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb"; - name = "kinfocenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz"; + sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy"; + name = "kinfocenter-5.5.0.tar.xz"; }; }; kmenuedit = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz"; - sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq"; - name = "kmenuedit-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz"; + sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n"; + name = "kmenuedit-5.5.0.tar.xz"; }; }; kscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz"; - sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5"; - name = "kscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz"; + sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6"; + name = "kscreen-5.5.0.tar.xz"; }; }; kscreenlocker = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz"; - sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg"; - name = "kscreenlocker-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz"; + sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9"; + name = "kscreenlocker-5.5.0.tar.xz"; }; }; ksshaskpass = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz"; - sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4"; - name = "ksshaskpass-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz"; + sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh"; + name = "ksshaskpass-5.5.0.tar.xz"; }; }; ksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz"; - sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73"; - name = "ksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz"; + sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv"; + name = "ksysguard-5.5.0.tar.xz"; }; }; kwallet-pam = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz"; - sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65"; - name = "kwallet-pam-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz"; + sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g"; + name = "kwallet-pam-5.5.0.tar.xz"; }; }; kwayland = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz"; - sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy"; - name = "kwayland-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz"; + sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9"; + name = "kwayland-5.5.0.tar.xz"; }; }; kwayland-integration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz"; - sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6"; - name = "kwayland-integration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz"; + sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4"; + name = "kwayland-integration-5.5.0.tar.xz"; }; }; kwin = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz"; - sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy"; - name = "kwin-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz"; + sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l"; + name = "kwin-5.5.0.tar.xz"; }; }; kwrited = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz"; - sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2"; - name = "kwrited-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz"; + sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8"; + name = "kwrited-5.5.0.tar.xz"; }; }; libkscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz"; - sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa"; - name = "libkscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz"; + sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3"; + name = "libkscreen-5.5.0.tar.xz"; }; }; libksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz"; - sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi"; - name = "libksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz"; + sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8"; + name = "libksysguard-5.5.0.tar.xz"; }; }; milou = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz"; - sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d"; - name = "milou-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz"; + sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm"; + name = "milou-5.5.0.tar.xz"; }; }; oxygen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz"; - sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5"; - name = "oxygen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz"; + sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x"; + name = "oxygen-5.5.0.tar.xz"; }; }; plasma-desktop = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz"; - sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp"; - name = "plasma-desktop-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz"; + sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4"; + name = "plasma-desktop-5.5.0.tar.xz"; }; }; plasma-mediacenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz"; - sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak"; - name = "plasma-mediacenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz"; + sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52"; + name = "plasma-mediacenter-5.5.0.tar.xz"; }; }; plasma-nm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz"; - sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds"; - name = "plasma-nm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz"; + sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4"; + name = "plasma-nm-5.5.0.tar.xz"; }; }; plasma-pa = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz"; - sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw"; - name = "plasma-pa-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz"; + sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km"; + name = "plasma-pa-5.5.0.tar.xz"; }; }; plasma-sdk = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz"; - sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k"; - name = "plasma-sdk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz"; + sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v"; + name = "plasma-sdk-5.5.0.tar.xz"; }; }; plasma-workspace = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz"; - sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv"; - name = "plasma-workspace-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz"; + sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13"; + name = "plasma-workspace-5.5.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz"; - sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz"; - name = "plasma-workspace-wallpapers-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz"; + sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz"; + name = "plasma-workspace-wallpapers-5.5.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.4.95"; + version = "1-5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/polkit-kde-agent-1-5.4.95.tar.xz"; - sha256 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg"; - name = "polkit-kde-agent-1-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz"; + sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c"; + name = "polkit-kde-agent-1-5.5.0.tar.xz"; }; }; powerdevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz"; - sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7"; - name = "powerdevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz"; + sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f"; + name = "powerdevil-5.5.0.tar.xz"; }; }; sddm-kcm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz"; - sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45"; - name = "sddm-kcm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz"; + sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0"; + name = "sddm-kcm-5.5.0.tar.xz"; }; }; systemsettings = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz"; - sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq"; - name = "systemsettings-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz"; + sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1"; + name = "systemsettings-5.5.0.tar.xz"; }; }; user-manager = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz"; - sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z"; - name = "user-manager-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz"; + sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729"; + name = "user-manager-5.5.0.tar.xz"; }; }; } From af4ce94a3d9fee19e9d3d974d681636d1f28b4e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Dec 2015 13:41:15 +0100 Subject: [PATCH 152/498] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-47-ga631ea6 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/e64881f25c2b1850f3198b5df804bd3dfbda0359 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/bc415aa435c9ededeccf7bfff34ea846cc2182c5 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/80256aab763992ee8f057cf8ea250e2077de8f1e - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/fd1a4b498e315172edbff27ec7c984f9f37bb90c --- .../haskell-modules/configuration-lts-0.0.nix | 7 + .../haskell-modules/configuration-lts-0.1.nix | 7 + .../haskell-modules/configuration-lts-0.2.nix | 7 + .../haskell-modules/configuration-lts-0.3.nix | 7 + .../haskell-modules/configuration-lts-0.4.nix | 7 + .../haskell-modules/configuration-lts-0.5.nix | 7 + .../haskell-modules/configuration-lts-0.6.nix | 7 + .../haskell-modules/configuration-lts-0.7.nix | 7 + .../haskell-modules/configuration-lts-1.0.nix | 7 + .../haskell-modules/configuration-lts-1.1.nix | 7 + .../configuration-lts-1.10.nix | 7 + .../configuration-lts-1.11.nix | 7 + .../configuration-lts-1.12.nix | 7 + .../configuration-lts-1.13.nix | 7 + .../configuration-lts-1.14.nix | 7 + .../configuration-lts-1.15.nix | 7 + .../haskell-modules/configuration-lts-1.2.nix | 7 + .../haskell-modules/configuration-lts-1.4.nix | 7 + .../haskell-modules/configuration-lts-1.5.nix | 7 + .../haskell-modules/configuration-lts-1.7.nix | 7 + .../haskell-modules/configuration-lts-1.8.nix | 7 + .../haskell-modules/configuration-lts-1.9.nix | 7 + .../haskell-modules/configuration-lts-2.0.nix | 7 + .../haskell-modules/configuration-lts-2.1.nix | 7 + .../configuration-lts-2.10.nix | 7 + .../configuration-lts-2.11.nix | 7 + .../configuration-lts-2.12.nix | 7 + .../configuration-lts-2.13.nix | 7 + .../configuration-lts-2.14.nix | 7 + .../configuration-lts-2.15.nix | 7 + .../configuration-lts-2.16.nix | 7 + .../configuration-lts-2.17.nix | 7 + .../configuration-lts-2.18.nix | 7 + .../configuration-lts-2.19.nix | 7 + .../haskell-modules/configuration-lts-2.2.nix | 7 + .../configuration-lts-2.20.nix | 7 + .../configuration-lts-2.21.nix | 7 + .../configuration-lts-2.22.nix | 7 + .../haskell-modules/configuration-lts-2.3.nix | 7 + .../haskell-modules/configuration-lts-2.4.nix | 7 + .../haskell-modules/configuration-lts-2.5.nix | 7 + .../haskell-modules/configuration-lts-2.6.nix | 7 + .../haskell-modules/configuration-lts-2.7.nix | 7 + .../haskell-modules/configuration-lts-2.8.nix | 7 + .../haskell-modules/configuration-lts-2.9.nix | 7 + .../haskell-modules/configuration-lts-3.0.nix | 8 + .../haskell-modules/configuration-lts-3.1.nix | 8 + .../configuration-lts-3.10.nix | 10 + .../configuration-lts-3.11.nix | 10 + .../configuration-lts-3.12.nix | 11 + .../configuration-lts-3.13.nix | 11 + .../configuration-lts-3.14.nix | 11 + .../configuration-lts-3.15.nix | 11 + .../configuration-lts-3.16.nix | 11 + .../configuration-lts-3.17.nix | 7991 +++++++++++++++++ .../haskell-modules/configuration-lts-3.2.nix | 8 + .../haskell-modules/configuration-lts-3.3.nix | 8 + .../haskell-modules/configuration-lts-3.4.nix | 8 + .../haskell-modules/configuration-lts-3.5.nix | 8 + .../haskell-modules/configuration-lts-3.6.nix | 8 + .../haskell-modules/configuration-lts-3.7.nix | 9 + .../haskell-modules/configuration-lts-3.8.nix | 10 + .../haskell-modules/configuration-lts-3.9.nix | 10 + .../haskell-modules/hackage-packages.nix | 1147 ++- 64 files changed, 9157 insertions(+), 456 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.17.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 2ff53d463a6..bb60198aeaf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -4018,8 +4018,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5967,6 +5969,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6147,6 +6150,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7974,6 +7978,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8034,6 +8039,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8470,6 +8476,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index fd637efd089..77b66031ece 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -4017,8 +4017,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5966,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6146,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7973,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8033,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8469,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 5d103d27334..da9c527ffa9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -4017,8 +4017,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5966,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6146,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7973,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8033,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8469,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index cb44b44fba5..04168fba70a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -4017,8 +4017,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5966,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6146,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7973,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8033,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8469,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 997e32b6637..e0cd9431130 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -4014,8 +4014,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5963,6 +5965,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6143,6 +6146,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7968,6 +7972,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8028,6 +8033,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8464,6 +8470,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 0e71e28bb5a..44d0e9653ad 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -4014,8 +4014,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; @@ -5963,6 +5965,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6143,6 +6146,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7968,6 +7972,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8028,6 +8033,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8464,6 +8470,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index c20716d6f99..3f4405e5b5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -4011,8 +4011,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5958,6 +5960,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6138,6 +6141,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7962,6 +7966,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8022,6 +8027,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8457,6 +8463,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index c1446d42b7f..f4673ed279f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -4011,8 +4011,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5958,6 +5960,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6138,6 +6141,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7962,6 +7966,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8022,6 +8027,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8457,6 +8463,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index ead41c58793..b8a801b5b39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -4001,8 +4001,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5946,6 +5948,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6126,6 +6129,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7946,6 +7950,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8006,6 +8011,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8440,6 +8446,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 91e9a18d20d..349496ec6c7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -3996,8 +3996,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5937,6 +5939,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6117,6 +6120,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7932,6 +7936,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7992,6 +7997,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8425,6 +8431,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index b7ea8fbd9a3..fdb4664c342 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -3983,8 +3983,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5912,6 +5914,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6090,6 +6093,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7898,6 +7902,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7957,6 +7962,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8388,6 +8394,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index f95b9dfb2e1..ddc53549cca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -3982,8 +3982,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5908,6 +5910,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6086,6 +6089,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7894,6 +7898,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7953,6 +7958,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8384,6 +8390,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 84b5e1a4cb0..9c8020b067b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -3982,8 +3982,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5907,6 +5909,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6085,6 +6088,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7891,6 +7895,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7950,6 +7955,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8381,6 +8387,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 6f751b83bff..906bf0a6a41 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -3980,8 +3980,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5905,6 +5907,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6083,6 +6086,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7888,6 +7892,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7947,6 +7952,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8378,6 +8384,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index e6e0c3a513e..9fff6650c52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -3977,8 +3977,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5898,6 +5900,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6076,6 +6079,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7880,6 +7884,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7939,6 +7944,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8370,6 +8376,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index c5969cc916a..4078218a73f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -3972,8 +3972,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5891,6 +5893,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6069,6 +6072,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7869,6 +7873,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7928,6 +7933,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8359,6 +8365,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 083d790098f..0c298e5d465 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -3993,8 +3993,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5934,6 +5936,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6113,6 +6116,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7926,6 +7930,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7986,6 +7991,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8419,6 +8425,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 14f07506a5e..d7f56325fbf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -3990,8 +3990,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5930,6 +5932,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6109,6 +6112,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7920,6 +7924,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7980,6 +7985,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8413,6 +8419,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 1258290c739..11b2b868116 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -3989,8 +3989,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5928,6 +5930,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6107,6 +6110,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7918,6 +7922,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7977,6 +7982,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8409,6 +8415,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 53a41015a39..c0097e30c76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -3989,8 +3989,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5922,6 +5924,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6101,6 +6104,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7912,6 +7916,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7971,6 +7976,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8403,6 +8409,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 567d8a80710..5d5aa564450 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -3986,8 +3986,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5917,6 +5919,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6096,6 +6099,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7907,6 +7911,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7966,6 +7971,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8397,6 +8403,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d476697577c..d77685d0a06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -3985,8 +3985,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5915,6 +5917,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6093,6 +6096,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7904,6 +7908,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7963,6 +7968,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8394,6 +8400,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index f638737f434..dc3f8a03f8b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -3946,8 +3946,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5835,6 +5837,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6013,6 +6016,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7802,6 +7806,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7861,6 +7866,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8289,6 +8295,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 589be759149..16ab241c515 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -3945,8 +3945,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5833,6 +5835,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6011,6 +6014,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7800,6 +7804,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7859,6 +7864,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8286,6 +8292,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 0d5ed5e62c4..3f109fadc73 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -3922,8 +3922,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5793,6 +5795,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5970,6 +5973,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7741,6 +7745,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7798,6 +7803,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8225,6 +8231,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 03ec74ba772..af11314a5ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -3920,8 +3920,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5787,6 +5789,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5963,6 +5966,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7731,6 +7735,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7788,6 +7793,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8215,6 +8221,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index d3c45cf95fa..439771557df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -3920,8 +3920,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5787,6 +5789,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5963,6 +5966,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7730,6 +7734,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7787,6 +7792,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8214,6 +8220,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 49b1232d2ab..681a3bbcce6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -3919,8 +3919,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5784,6 +5786,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5960,6 +5963,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7727,6 +7731,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7784,6 +7789,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8211,6 +8217,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 4274a643010..65ec277782b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -3917,8 +3917,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5781,6 +5783,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5957,6 +5960,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7722,6 +7726,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7779,6 +7784,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8205,6 +8211,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 1c0d5a34b32..835f61f8334 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -3916,8 +3916,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5777,6 +5779,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5953,6 +5956,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7717,6 +7721,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7774,6 +7779,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8200,6 +8206,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index ab046c6ce10..c6d5421a1be 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -3909,8 +3909,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5769,6 +5771,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5945,6 +5948,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7708,6 +7712,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7765,6 +7770,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8191,6 +8197,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index acf242873d5..b0ec9efa812 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -3902,8 +3902,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5762,6 +5764,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5937,6 +5940,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7699,6 +7703,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7756,6 +7761,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8182,6 +8188,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index cac29a5c87f..18328bd080e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -3898,8 +3898,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5756,6 +5758,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5931,6 +5934,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7691,6 +7695,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7748,6 +7753,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8173,6 +8179,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 556e67eac1b..f4fbe751b3b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -3897,8 +3897,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5753,6 +5755,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5928,6 +5931,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7686,6 +7690,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7743,6 +7748,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8168,6 +8174,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 07ce7269875..fa88242206f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -3941,8 +3941,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5829,6 +5831,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6007,6 +6010,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7795,6 +7799,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7854,6 +7859,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8281,6 +8287,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 813e6eb409f..beb329bab16 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -3894,8 +3894,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5750,6 +5752,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5925,6 +5928,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7681,6 +7685,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7738,6 +7743,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8163,6 +8169,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index b3c53cb2245..962ee75a7bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -3893,8 +3893,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5748,6 +5750,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5923,6 +5926,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7678,6 +7682,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7735,6 +7740,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8158,6 +8164,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index e1a6b0eb2d1..800e96ff390 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -3892,8 +3892,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_4_0"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5744,6 +5746,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5919,6 +5922,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7674,6 +7678,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7731,6 +7736,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8154,6 +8160,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 0a0b42b079d..732e6c33b7f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -3940,8 +3940,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5827,6 +5829,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6005,6 +6008,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7792,6 +7796,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7851,6 +7856,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8278,6 +8284,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index d81afbaacf5..d39ef0b551d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -3939,8 +3939,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5825,6 +5827,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6002,6 +6005,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7787,6 +7791,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7846,6 +7851,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8273,6 +8279,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index ca02747456d..bc182e5e660 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -3938,8 +3938,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5823,6 +5825,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6000,6 +6003,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7784,6 +7788,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7843,6 +7848,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8270,6 +8276,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 7d0f1c1fd76..c37a385b4a6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -3933,8 +3933,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5817,6 +5819,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5994,6 +5997,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7778,6 +7782,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7835,6 +7840,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8262,6 +8268,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 4d5e4803d56..761dd29669a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -3932,8 +3932,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5816,6 +5818,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5993,6 +5996,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7777,6 +7781,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7834,6 +7839,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8261,6 +8267,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 9f03d32e517..1745628da63 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -3930,8 +3930,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5812,6 +5814,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5989,6 +5992,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7769,6 +7773,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7826,6 +7831,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8253,6 +8259,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 233897be8ec..cd600bcdea7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -3924,8 +3924,10 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5802,6 +5804,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5979,6 +5982,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7753,6 +7757,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7810,6 +7815,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8237,6 +8243,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index c6040a33c57..906696b4b9f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -3769,8 +3769,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5271,6 +5273,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5543,6 +5546,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5711,6 +5715,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7418,6 +7423,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7471,6 +7477,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7876,6 +7883,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index eb352029d07..77d7e97b3e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -3764,8 +3764,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5264,6 +5266,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5535,6 +5538,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5703,6 +5707,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7408,6 +7413,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7461,6 +7467,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7865,6 +7872,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 4bd91a9ff3a..d0f30d12556 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -2409,6 +2409,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3700,7 +3701,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5175,6 +5178,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5441,6 +5445,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5608,6 +5613,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7271,6 +7277,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7324,6 +7331,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7679,6 +7687,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7718,6 +7727,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index b187c422b29..98e84ca9f10 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -2407,6 +2407,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3695,7 +3696,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5169,6 +5172,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5435,6 +5439,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5602,6 +5607,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7260,6 +7266,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7313,6 +7320,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7668,6 +7676,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7707,6 +7716,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 046dc7deca4..154bd227acc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -2402,6 +2402,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3689,7 +3690,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5161,6 +5164,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5427,6 +5431,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5594,6 +5599,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7248,6 +7254,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7301,6 +7308,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7525,6 +7533,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7655,6 +7664,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7694,6 +7704,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index c7d18ef001b..2e000577048 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -2402,6 +2402,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3689,7 +3690,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5159,6 +5162,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5424,6 +5428,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5591,6 +5596,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7243,6 +7249,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7296,6 +7303,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7520,6 +7528,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7650,6 +7659,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7688,6 +7698,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 7f0c9a82922..15706031f7a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -2397,6 +2397,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -3678,7 +3679,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5146,6 +5149,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5410,6 +5414,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5577,6 +5582,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7227,6 +7233,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7280,6 +7287,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7503,6 +7511,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7633,6 +7642,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_2"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7670,6 +7680,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index d81910849e6..a7dfcdb3f68 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -2396,6 +2396,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -3675,7 +3676,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5141,6 +5144,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5405,6 +5409,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5571,6 +5576,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7218,6 +7224,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7271,6 +7278,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7494,6 +7502,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7624,6 +7633,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; @@ -7659,6 +7669,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 00850487ff0..ad66fe7f027 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -2394,6 +2394,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -3671,7 +3672,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5134,6 +5137,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5398,6 +5402,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5564,6 +5569,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7202,6 +7208,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7255,6 +7262,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7478,6 +7486,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7608,6 +7617,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; @@ -7643,6 +7653,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix new file mode 100644 index 00000000000..261627066da --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -0,0 +1,7991 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.17 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet" = doDistribute super."HaskellNet_0_4_5"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdajudge" = dontDistribute super."Lambdajudge"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "RSA" = doDistribute super."RSA_2_1_0_3"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "ad" = doDistribute super."ad_4_2_4"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "alga" = dontDistribute super."alga"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-apigateway" = dontDistribute super."amazonka-apigateway"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-inspector" = dontDistribute super."amazonka-inspector"; + "amazonka-iot" = dontDistribute super."amazonka-iot"; + "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-waf" = dontDistribute super."amazonka-waf"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apply-refact" = dontDistribute super."apply-refact"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; + "argon" = dontDistribute super."argon"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "atp-haskell" = dontDistribute super."atp-haskell"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blake2" = dontDistribute super."blake2"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "buffon" = dontDistribute super."buffon"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "cacophony" = dontDistribute super."cacophony"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cayley-dickson" = dontDistribute super."cayley-dickson"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clang-pure" = dontDistribute super."clang-pure"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_15"; + "clash-lib" = doDistribute super."clash-lib_0_5_13"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_3"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_10"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_3_0_10"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "composition-tree" = dontDistribute super."composition-tree"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-output" = dontDistribute super."concurrent-output"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; + "consumers" = dontDistribute super."consumers"; + "container" = dontDistribute super."container"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "contravariant-extras" = dontDistribute super."contravariant-extras"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cubicspline" = doDistribute super."cubicspline_0_1_1"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-construction" = dontDistribute super."data-construction"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layer" = dontDistribute super."data-layer"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "declarative" = dontDistribute super."declarative"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-gestalt" = dontDistribute super."diff-gestalt"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "dixi" = dontDistribute super."dixi"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "double-metaphone" = dontDistribute super."double-metaphone"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumerate" = dontDistribute super."enumerate"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exact-real" = dontDistribute super."exact-real"; + "exception-hierarchy" = dontDistribute super."exception-hierarchy"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-maybe" = dontDistribute super."flat-maybe"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = dontDistribute super."fn"; + "fn-extra" = dontDistribute super."fn-extra"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; + "forth-hll" = dontDistribute super."forth-hll"; + "foscam-directory" = dontDistribute super."foscam-directory"; + "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-concurrent" = dontDistribute super."free-concurrent"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freenect" = doDistribute super."freenect_1_2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functional-kmp" = dontDistribute super."functional-kmp"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functor-utils" = dontDistribute super."functor-utils"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-deriving" = doDistribute super."generic-deriving_1_8_0"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geo-uk" = dontDistribute super."geo-uk"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-session" = dontDistribute super."ghc-session"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-fmt" = dontDistribute super."git-fmt"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "grouped-list" = dontDistribute super."grouped-list"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hScraper" = dontDistribute super."hScraper"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handa-opengl" = dontDistribute super."handa-opengl"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-tor" = dontDistribute super."haskell-tor"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskintex" = doDistribute super."haskintex_0_5_1_0"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-core" = dontDistribute super."haskoin-core"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-node" = dontDistribute super."haskoin-node"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_5_5"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger" = doDistribute super."hledger_0_26"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-lib" = doDistribute super."hledger-lib_0_26"; + "hledger-ui" = dontDistribute super."hledger-ui"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = doDistribute super."hledger-web_0_26"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix" = doDistribute super."hmatrix_0_16_1_5"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3"; + "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsignal" = doDistribute super."hsignal_0_2_7_1"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstatistics" = doDistribute super."hstatistics_0_2_5_2"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_0_4"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huckleberry" = dontDistribute super."huckleberry"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hworker" = dontDistribute super."hworker"; + "hworker-ses" = dontDistribute super."hworker-ses"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = doDistribute super."hyperloglog_0_3_4"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "ical" = dontDistribute super."ical"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jose-jwt" = doDistribute super."jose-jwt_0_6_2"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens" = doDistribute super."lens_4_12_3"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lens-utils" = dontDistribute super."lens-utils"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libinfluxdb" = dontDistribute super."libinfluxdb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lift-generics" = dontDistribute super."lift-generics"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_19_1_3"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup" = doDistribute super."markup_1_1_0"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcmc-types" = dontDistribute super."mcmc-types"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = dontDistribute super."megaparsec"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mighty-metropolis" = dontDistribute super."mighty-metropolis"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_9_3"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = dontDistribute super."mwc-probability"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats" = doDistribute super."nats_1"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-composed" = dontDistribute super."network-transport-composed"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-browser" = dontDistribute super."open-browser"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_3_3"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; + "path-extra" = dontDistribute super."path-extra"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "pathwalk" = dontDistribute super."pathwalk"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cacophony" = dontDistribute super."pipes-cacophony"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot" = doDistribute super."plot_0_2_3_4"; + "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-connector" = dontDistribute super."postgresql-connector"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefix-units" = doDistribute super."prefix-units_0_1_0_2"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-editor" = dontDistribute super."read-editor"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection" = doDistribute super."reflection_2"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa" = doDistribute super."repa_3_4_0_1"; + "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-io" = doDistribute super."repa-io_3_4_0_1"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_36_0_6"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; + "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8"; + "rest-snap" = doDistribute super."rest-snap_0_1_17_18"; + "rest-wai" = doDistribute super."rest-wai_0_1_0_8"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "second-transfer" = doDistribute super."second-transfer_0_6_1_0"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups" = doDistribute super."semigroups_0_16_2_2"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; + "servant-yaml" = dontDistribute super."servant-yaml"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplest-sqlite" = dontDistribute super."simplest-sqlite"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "singletons" = doDistribute super."singletons_1_1_2_1"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "speedy-slice" = dontDistribute super."speedy-slice"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-core" = dontDistribute super."stripe-core"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "success" = dontDistribute super."success"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swagger2" = dontDistribute super."swagger2"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tateti-tateti" = dontDistribute super."tateti-tateti"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-postgresql" = dontDistribute super."text-postgresql"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-cas" = dontDistribute super."th-cas"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-orphans" = doDistribute super."th-orphans_0_12_2"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treersec" = dontDistribute super."treersec"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_5"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-list" = doDistribute super."type-list_0_2_0_0"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urlpath" = doDistribute super."urlpath_2_1_0"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector" = doDistribute super."vector_0_10_12_3"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_3_1"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_3"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_3_1"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "withdependencies" = dontDistribute super."withdependencies"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-csp" = dontDistribute super."yesod-csp"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; + "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; + "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zim-parser" = dontDistribute super."zim-parser"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipkin" = dontDistribute super."zipkin"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 8b834fa3e6c..631da53ead6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -3758,8 +3758,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5256,6 +5258,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5527,6 +5530,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5695,6 +5699,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7393,6 +7398,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7446,6 +7452,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7849,6 +7856,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 754890d538f..55cf748dfe5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -3753,8 +3753,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5249,6 +5251,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5519,6 +5522,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5687,6 +5691,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7382,6 +7387,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7435,6 +7441,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7837,6 +7844,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index b1f7c28eb53..cd1858c1774 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -3752,8 +3752,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5248,6 +5250,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5518,6 +5521,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5686,6 +5690,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7379,6 +7384,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7432,6 +7438,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7834,6 +7841,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 4f782415e74..c9b18487c15 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -3746,8 +3746,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5236,6 +5238,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5505,6 +5508,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5673,6 +5677,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7358,6 +7363,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7411,6 +7417,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7813,6 +7820,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f586a3cf79e..82a4183307a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -3738,8 +3738,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5224,6 +5226,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5492,6 +5495,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5660,6 +5664,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7344,6 +7349,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7397,6 +7403,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7796,6 +7803,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 706071fc7a7..701852f4484 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -2424,6 +2424,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6"; @@ -3728,7 +3729,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5208,6 +5211,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5476,6 +5480,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5644,6 +5649,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7321,6 +7327,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7374,6 +7381,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7771,6 +7779,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 3155a11c1fd..8886aa895e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -2418,6 +2418,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3717,7 +3718,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5195,6 +5198,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5463,6 +5467,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5631,6 +5636,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7303,6 +7309,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7356,6 +7363,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7713,6 +7721,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7752,6 +7761,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index f6b4862f214..e57c1488001 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -2413,6 +2413,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -3709,7 +3710,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -5187,6 +5190,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5455,6 +5459,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5622,6 +5627,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -7294,6 +7300,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7347,6 +7354,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7704,6 +7712,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7743,6 +7752,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a967985c450..16ad44023b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -510,7 +510,6 @@ self: { homepage = "http://www.haskell.org/asn1"; description = "ASN.1 support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AVar" = callPackage @@ -841,7 +840,6 @@ self: { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -1530,7 +1528,6 @@ self: { homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1572,7 +1569,6 @@ self: { homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1602,7 +1598,6 @@ self: { homepage = "https://github.com/joecrayne/hs-bitsyntax"; description = "A module to aid in the (de)serialisation of binary data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Bitly" = callPackage @@ -2243,7 +2238,6 @@ self: { jailbreak = true; description = "A CSP-M parser compatible with FDR-2.91"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Interpreter" = callPackage @@ -2261,7 +2255,6 @@ self: { jailbreak = true; description = "An interpreter for CSPM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-ToProlog" = callPackage @@ -2278,7 +2271,6 @@ self: { jailbreak = true; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-cspm" = callPackage @@ -2837,7 +2829,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -2856,7 +2847,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ChasingBottoms_1_3_0_8" = callPackage @@ -3500,7 +3490,6 @@ self: { homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CoreFoundation" = callPackage @@ -4150,7 +4139,6 @@ self: { homepage = "http://github.com/sordina/Deadpan-DDP"; description = "Write clients for Meteor's DDP Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DebugTraceHelpers" = callPackage @@ -4876,7 +4864,6 @@ self: { homepage = "http://rwd.rdockins.name/edison/home/"; description = "A library of efficent, purely-functional data structures (Core Implementations)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EditTimeReport" = callPackage @@ -5338,7 +5325,6 @@ self: { homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FTGL" = callPackage @@ -6180,7 +6166,6 @@ 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 @@ -6544,7 +6529,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -7126,7 +7110,6 @@ self: { homepage = "http://haskell.org/haskellwiki/GtkTV"; description = "Gtk-based GUIs for Tangible Values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GuiHaskell" = callPackage @@ -11529,8 +11512,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Kriens"; - version = "0.1.0.0"; - sha256 = "05ec474f2b9071c36847937042da5624654e466b96322aa039e0129395ef63b6"; + version = "0.1.0.1"; + sha256 = "5c8fa68abb1db66c234dcb378cf0de08b21e3e6a2daaf888feda5a0c0c22d9ac"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/matteoprovenzano/kriens-hs.git"; description = "Category for Continuation Passing Style"; @@ -11670,7 +11653,6 @@ self: { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "LambdaINet" = callPackage @@ -14389,7 +14371,6 @@ self: { homepage = "https://github.com/choener/OrderedBits"; description = "Efficient ordered (by popcount) enumeration of bits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ordinals" = callPackage @@ -14850,7 +14831,6 @@ self: { executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlslTools" = callPackage @@ -14959,7 +14939,6 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -16191,16 +16170,19 @@ self: { }) {}; "SDL-image" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1.1"; - sha256 = "f88b713e9c33a72e8b7a2a4e16871c6b8b993599538aff2faae8622388c002d4"; + version = "0.6.1.2"; + sha256 = "01892919dc9576c9a7b7c6698f2308c9caca61afa5550197be1fdb1231e56df9"; + revision = "1"; + editedCabalFile = "7e837026adb1262504d8bc4799628961f66200ad1a5f25e2b6b5842f0618dd6b"; libraryHaskellDepends = [ base SDL ]; + librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; + }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage ({ mkDerivation, base, SDL, SDL_mixer }: @@ -16208,6 +16190,8 @@ self: { pname = "SDL-mixer"; version = "0.6.2.0"; sha256 = "1969170ee9d20811697f1f3d3150d388d45a809ea3d72495980da0968e5719ba"; + revision = "1"; + editedCabalFile = "9f17a645f815b3a0f47507263f0d2a8f57ff9d6893c8c967a7241e16e68b7ca4"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -16621,19 +16605,22 @@ self: { }) {}; "SciFlow" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly - , template-haskell, text, unordered-containers, yaml + ({ mkDerivation, base, bytestring, data-default-class, lens, mtl + , optparse-applicative, shelly, split, template-haskell, text + , th-lift, unordered-containers, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.2.0"; - sha256 = "cfa24767f5c92f1e4e4baeb68382e83c7939d7715342e1a7005e16590b2b70b3"; + version = "0.3.0"; + sha256 = "f23c90f2708edde150c16eff8692ac8cd47bbf2455aaa355c0546e1f9cb0becf"; libraryHaskellDepends = [ - base bytestring data-default-class mtl shelly template-haskell text - unordered-containers yaml + base bytestring data-default-class lens mtl optparse-applicative + shelly split template-haskell text th-lift unordered-containers + yaml ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -18734,7 +18721,6 @@ self: { homepage = "http://github.com/grwlf/vkhs"; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "Validation" = callPackage @@ -20418,7 +20404,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage @@ -20480,7 +20465,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-random" = callPackage @@ -21803,8 +21787,8 @@ self: { }: mkDerivation { pname = "aeson-casing"; - version = "0.1.0.2"; - sha256 = "5df9102c4c4f63d87314fd1d09bdcfa9bd4ebd2efee40e66bf651a1bc848211f"; + version = "0.1.0.4"; + sha256 = "706139db4d17cae7a770802b3103584b3fa1c0d7db5ae2d463cfbaa99549bb5b"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th @@ -21892,6 +21876,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-extra_0_2_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , exceptions, hashable, quickcheck-instances, scientific, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.2.3.0"; + sha256 = "43ace09b9c03c5c55216b2062228bda94e5fd23333a0cc1eca0e5478546f9e77"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + scientific template-haskell text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + template-haskell text time unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-extra#readme"; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text , unordered-containers @@ -22859,6 +22868,7 @@ self: { ]; executableToolDepends = [ happy ]; testHaskellDepends = [ base process ]; + doCheck = false; homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -31086,7 +31096,6 @@ self: { homepage = "http://github.com/iconnect/aws-cloudfront-signer"; description = "For signing AWS CloudFront HTTP URL requests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-configuration-tools" = callPackage @@ -31179,7 +31188,6 @@ self: { homepage = "https://github.com/zalora/aws-ec2"; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-elastic-transcoder" = callPackage @@ -31443,7 +31451,6 @@ self: { homepage = "https://github.com/yunomu/aws-sdk-text-converter"; description = "The text converter for aws-sdk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sdk-xml-unordered" = callPackage @@ -31465,7 +31472,6 @@ self: { homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered"; description = "The xml parser for aws-sdk package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sign4" = callPackage @@ -32732,8 +32738,8 @@ self: { ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { pname = "basex-client"; - version = "0.1.0.0"; - sha256 = "16954927f7a178fbb673bd66a836fad19072562d0cdac39397b4ba74c8ae2ba1"; + version = "0.2.0.0"; + sha256 = "90f165babb781cb9a38107c32bd9c0d2cbee836f2120c7c2bf39b1e1a5ef1d0d"; libraryHaskellDepends = [ base network pureMD5 utf8-string ]; description = "A BaseX client for Haskell"; license = stdenv.lib.licenses.mit; @@ -36987,7 +36993,6 @@ self: { jailbreak = true; description = "Utilities for Bluetile"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blunt" = callPackage @@ -37438,7 +37443,6 @@ self: { libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brainfuck-tut" = callPackage @@ -38153,7 +38157,6 @@ self: { homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv" = callPackage @@ -38783,8 +38786,8 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.1.4"; - sha256 = "d4fda93fb4e9d295e8782ac8dda1a46f3a1e86b0f6097ea4bb594f38d3492e3e"; + version = "0.2.2"; + sha256 = "ba0177ecfd71e7370b2c57fb23de72b8bc65c7e0533599fbd5791af29ea79260"; libraryHaskellDepends = [ base base-prelude bytestring ]; testHaskellDepends = [ base-prelude bytestring QuickCheck quickcheck-instances tasty @@ -40604,7 +40607,6 @@ self: { executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake" = callPackage @@ -40753,7 +40755,6 @@ 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 @@ -41094,7 +41095,6 @@ self: { homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carray" = callPackage @@ -42098,7 +42098,6 @@ self: { jailbreak = true; description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "cereal_0_4_1_0" = callPackage @@ -43641,7 +43640,6 @@ self: { jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clafer" = callPackage @@ -45721,7 +45719,6 @@ self: { homepage = "http://github.com/haskell-distributed/cloud-haskell"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudfront-signer" = callPackage @@ -46132,7 +46129,6 @@ self: { homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "code-builder" = callPackage @@ -47326,7 +47322,6 @@ self: { homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "competition" = callPackage @@ -47489,7 +47484,6 @@ 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 @@ -48280,7 +48274,6 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsndfile audio file library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-combinators_0_3_0_4" = callPackage @@ -48791,7 +48784,6 @@ self: { homepage = "https://github.com/sdroege/conduit-iconv"; description = "Conduit for character encoding conversion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-network-stream" = callPackage @@ -49635,7 +49627,6 @@ self: { base bytestring cereal containers mtl nanomsg-haskell time ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant_1_2" = callPackage @@ -50340,7 +50331,6 @@ self: { ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -50373,7 +50363,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-language" = callPackage @@ -50392,7 +50381,6 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-libraries" = callPackage @@ -50409,7 +50397,6 @@ self: { homepage = "https://github.com/leepike/copilot-libraries"; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-sbv" = callPackage @@ -52593,7 +52580,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -52657,7 +52643,6 @@ self: { homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csp" = callPackage @@ -53215,7 +53200,6 @@ self: { ]; description = "Terminal tool for viewing tabular data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curve25519" = callPackage @@ -53251,7 +53235,6 @@ self: { ]; description = "Library for drawing curve based images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "custom-prelude" = callPackage @@ -54492,7 +54475,6 @@ self: { homepage = "https://github.com/wdanilo/layer"; description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-layout" = callPackage @@ -54774,11 +54756,10 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "data-ref"; - version = "0.0"; - sha256 = "f644aab0d8e1f67110fc354130517bcd365701899a189fcfbc0e86681cfb912d"; + version = "0.0.1"; + sha256 = "6669a8b1351f826829a85d9b360bfc5328b316272dacb22f7186ef76824687ed"; libraryHaskellDepends = [ base stm transformers ]; - jailbreak = true; - homepage = "http://www.haskell.org/haskellwiki/Mutable_variable"; + homepage = "http://wiki.haskell.org/Mutable_variable"; description = "Unify STRef and IORef in plain Haskell 98"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -57388,7 +57369,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder" = callPackage + "diagrams-builder_0_7_2_0" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -57414,9 +57395,10 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_1" = callPackage + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -57442,7 +57424,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo_1_2_0_4" = callPackage @@ -58045,7 +58026,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock_0_2_2_12" = callPackage @@ -58187,38 +58167,6 @@ self: { }) {}; "diagrams-haddock" = callPackage - ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring - , Cabal, cautious-file, cmdargs, containers, cpphs - , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath - , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec - , QuickCheck, split, strict, tasty, tasty-quickcheck, text - , uniplate - }: - mkDerivation { - pname = "diagrams-haddock"; - version = "0.3.0.9"; - sha256 = "e23fea4218e1b141bbce79b7a873aca61855a3d3fc2bce3d711f10f254f7c183"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base base64-bytestring bytestring cautious-file - containers cpphs diagrams-builder diagrams-lib diagrams-svg - directory filepath haskell-src-exts lens linear lucid-svg mtl - parsec split strict text uniplate - ]; - executableHaskellDepends = [ - base Cabal cmdargs cpphs directory filepath - ]; - testHaskellDepends = [ - base containers haskell-src-exts lens parsec QuickCheck tasty - tasty-quickcheck - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Preprocessor for embedding diagrams in Haddock documentation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-haddock_0_3_0_10" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -58230,6 +58178,8 @@ self: { pname = "diagrams-haddock"; version = "0.3.0.10"; sha256 = "49ed17c49c1aae075892e9992b691867e418944a37141f028a7a2e6220d6f0af"; + revision = "1"; + editedCabalFile = "c77d5d5a908d03ba9fc545f977ced5d393a22e6de5b9d00deb4fb7fddd4a366d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58248,7 +58198,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -58652,7 +58601,6 @@ self: { homepage = "https://github.com/prowdsponsor/diagrams-qrcode"; description = "Draw QR codes to SVG, PNG, PDF or PS files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-rasterific_0_1_0_7" = callPackage @@ -60298,7 +60246,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-azure" = callPackage @@ -60388,7 +60335,6 @@ self: { 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 @@ -60460,7 +60406,6 @@ self: { 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 @@ -60525,7 +60470,6 @@ self: { 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 @@ -60630,7 +60574,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-registry"; description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-simplelocalnet_0_2_2_0" = callPackage @@ -60764,7 +60707,6 @@ self: { 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 @@ -60838,7 +60780,6 @@ self: { 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 @@ -60862,7 +60803,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-tests"; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -62365,7 +62305,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dstring" = callPackage @@ -62483,7 +62422,6 @@ self: { jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree_0_2_0_5" = callPackage @@ -62849,8 +62787,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.1.1"; - sha256 = "9742e52dae0b13482a996aeb5da6f7982ffef8eccbc26ba1f1d3178a759b93aa"; + version = "0.1.1.2"; + sha256 = "f991e349360af3a03723c373a3480764a0280e5ff5bd1037e3711e6c1776d60c"; libraryHaskellDepends = [ async base colour constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib @@ -65539,7 +65477,6 @@ self: { libraryHaskellDepends = [ base singletons template-haskell void ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equivalence" = callPackage @@ -65620,7 +65557,6 @@ self: { homepage = "http://github.com/gombocarti/erlang-ffi"; description = "FFI interface to Erlang"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eros" = callPackage @@ -66584,7 +66520,6 @@ self: { description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "every-bit-counts" = callPackage @@ -66678,7 +66613,6 @@ self: { homepage = "http://github.com/expipiplus1/exact-real"; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-hierarchy" = callPackage @@ -67485,7 +67419,6 @@ self: { ]; description = "Sort large arrays on your hard drive. Kind of like the unix util sort."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extra_1_0" = callPackage @@ -70768,7 +70701,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Uniplate-style generic traversals for optionally annotated fixed-point types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixpoint" = callPackage @@ -71302,7 +71234,6 @@ self: { homepage = "http://github.com/deech/fltkhs"; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fltkhs-fluid-examples" = callPackage @@ -72648,7 +72579,6 @@ self: { jailbreak = true; description = "A markdown to Frame GUI writer for Pandoc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "franchise" = callPackage @@ -73234,7 +73164,6 @@ self: { homepage = "https://github.com/atzeus/FRPNow"; description = "Program GUIs with GTK and frpnow!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frquotes" = callPackage @@ -73567,7 +73496,6 @@ self: { homepage = "https://notabug.org/fr33domlover/funbot/"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funbot-client" = callPackage @@ -73933,7 +73861,6 @@ self: { homepage = "https://github.com/tlaitinen/fuzzy-timings"; description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -74051,7 +73978,6 @@ self: { homepage = "http://github.com/marcusbuffett/game-of-life"; description = "Conway's Game of Life"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-probability" = callPackage @@ -75235,7 +75161,6 @@ self: { homepage = "https://github.com/PaulJohnson/geodetics"; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -75286,7 +75211,6 @@ self: { homepage = "https://github.com/domdere/hs-geojson"; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geom2d" = callPackage @@ -75379,6 +75303,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "getopt-generics_0_13" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13"; + sha256 = "d193384dca0c9fdd8492ee888b1b8954b247f83ead6e4f3f81ded94377aaa34a"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + homepage = "https://github.com/soenkehahn/getopt-generics#readme"; + description = "Create command line interfaces with ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -75544,7 +75489,6 @@ self: { jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-parallel" = callPackage @@ -75938,7 +75882,6 @@ self: { homepage = "https://github.com/JPMoresmau/ghc-pkg-lib"; description = "Provide library support for ghc-pkg information"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prim_0_4_0_0" = callPackage @@ -76154,7 +76097,6 @@ self: { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-diagrams" = callPackage @@ -76224,7 +76166,6 @@ self: { homepage = "https://github.com/chrisdone/ghci-ng"; description = "Next generation GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-pretty" = callPackage @@ -76385,7 +76326,6 @@ self: { ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -76400,7 +76340,6 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-websockets" = callPackage @@ -76501,7 +76440,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -76558,7 +76496,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-gio" = callPackage @@ -76577,7 +76514,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-glib" = callPackage @@ -76595,7 +76531,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -76614,7 +76549,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gtk" = callPackage @@ -76673,7 +76607,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Notify bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-pango" = callPackage @@ -76692,7 +76625,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) pango;}; "gi-soup" = callPackage @@ -76711,7 +76643,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Soup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) libsoup;}; "gi-vte" = callPackage @@ -76870,7 +76801,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GIO"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gipeda_0_1_0_2" = callPackage @@ -77135,6 +77065,72 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; + "git-annex_5_20151208" = callPackage + ({ mkDerivation, aeson, async, aws, base, blaze-builder + , bloomfilter, bup, byteable, bytestring, case-insensitive + , clientsession, concurrent-output, conduit, conduit-extra + , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , directory, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify + , hslogger, http-client, http-conduit, http-types, IfElse, json + , lsof, MissingH, monad-control, monad-logger, mtl, network + , network-info, network-multicast, network-protocol-xmpp + , network-uri, old-locale, openssh, optparse-applicative + , path-pieces, perl, persistent, persistent-sqlite + , persistent-template, process, QuickCheck, random, regex-tdfa + , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare + , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , template-haskell, text, time, torrent, transformers, unix + , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls + , wget, which, xml-types, yesod, yesod-core, yesod-default + , yesod-form, yesod-static + }: + mkDerivation { + pname = "git-annex"; + version = "5.20151208"; + sha256 = "1513ecf944a174c7b0e7a68ec6722544c8b85c74d8ff89fc8d9ea8c177c4fce9"; + configureFlags = [ + "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" + "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" + "-fwebapp-secure" "-fwebdav" "-fxmpp" + ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async aws base blaze-builder bloomfilter byteable bytestring + case-insensitive clientsession concurrent-output conduit + conduit-extra containers crypto-api cryptonite data-default DAV + dbus directory dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath gnutls hinotify hslogger http-client + http-conduit http-types IfElse json MissingH monad-control + monad-logger mtl network network-info network-multicast + network-protocol-xmpp network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare stm tasty tasty-hunit tasty-quickcheck + tasty-rerun template-haskell text time torrent transformers unix + unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types + yesod yesod-core yesod-default yesod-form yesod-static + ]; + executableSystemDepends = [ + bup curl git gnupg lsof openssh perl rsync wget which + ]; + preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; + postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; + installPhase = "make PREFIX=$out CABAL=./Setup install"; + checkPhase = "./git-annex test"; + enableSharedExecutables = false; + homepage = "http://git-annex.branchable.com/"; + description = "manage files with git, without checking their contents into git"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + inherit (pkgs) which;}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -77214,6 +77210,27 @@ self: { homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "git-fmt_0_4_0_0" = callPackage + ({ mkDerivation, base, exceptions, extra, fast-logger, filepath + , monad-logger, monad-parallel, mtl, omnifmt, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + }: + mkDerivation { + pname = "git-fmt"; + version = "0.4.0.0"; + sha256 = "13f5792fd2006f56a916f4767acef37816b513ec88d4f0aa61b62f35ae725952"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl omnifmt optparse-applicative pipes + pipes-concurrency temporary text time + ]; + homepage = "https://github.com/hjwylde/git-fmt"; + description = "Custom git command for formatting code"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -77386,7 +77403,6 @@ self: { homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitcache" = callPackage @@ -81010,8 +81026,8 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.2.7"; - sha256 = "4929cfb35bee8f9562122248a216cb365f9fd307077fce6ec8ec0380348880ce"; + version = "1.2.8"; + sha256 = "e4fe1c418f8c975581cbfaf2ada04ad69d6f70cc0ded8c3603e2179d03d3c2fc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82011,7 +82027,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-helpers" = callPackage @@ -82028,7 +82043,6 @@ self: { homepage = "http://keera.es/blog/community"; description = "A collection of auxiliary operations and widgets related to Gtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-jsinput" = callPackage @@ -82041,7 +82055,6 @@ self: { homepage = "http://github.com/timthelion/gtk-jsinput"; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-largeTreeStore" = callPackage @@ -82058,7 +82071,6 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-mac-integration" = callPackage @@ -82107,7 +82119,6 @@ self: { homepage = "http://github.com/timthelion/gtk-simple-list-view"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toggle-button-list" = callPackage @@ -82120,7 +82131,6 @@ self: { homepage = "http://github.com/timthelion/gtk-toggle-button-list"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toy" = callPackage @@ -82147,7 +82157,6 @@ self: { homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; "gtk2hs-buildtools_0_13_0_3" = callPackage @@ -82301,7 +82310,6 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gtksourceview2 package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-th" = callPackage @@ -82328,7 +82336,6 @@ self: { homepage = "http://www.haskell.org/hello/"; description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-rpn" = callPackage @@ -82524,7 +82531,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -82617,7 +82623,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) gtksourceview;}; "gtksourceview3" = callPackage @@ -82636,7 +82641,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -82677,7 +82681,6 @@ self: { homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gutenberg-fibonaccis" = callPackage @@ -83354,7 +83357,6 @@ self: { homepage = "http://perception.inf.um.es/tensor"; description = "Multidimensional arrays and simple tensor computations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hVOIDP" = callPackage @@ -83388,7 +83390,6 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haar" = callPackage @@ -84639,7 +84640,6 @@ self: { jailbreak = true; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -84660,7 +84660,6 @@ self: { jailbreak = true; description = "Dynamic launcher of Hails applications"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hairy" = callPackage @@ -85237,7 +85236,6 @@ self: { homepage = "https://github.com/maxsnew/hakyll-elm"; description = "Hakyll wrapper for the Elm compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -85401,7 +85399,6 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haltavista" = callPackage @@ -87649,7 +87646,6 @@ self: { homepage = "http://github.com/chrisdone/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-exp-parser" = callPackage @@ -87663,7 +87659,6 @@ self: { homepage = "https://github.com/emilaxelsson/haskell-exp-parser"; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-formatter" = callPackage @@ -87763,7 +87758,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "haskell-gi-base" = callPackage @@ -87781,7 +87775,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-import-graph" = callPackage @@ -87863,7 +87856,6 @@ self: { homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names_0_4_1" = callPackage @@ -88310,13 +88302,14 @@ self: { pname = "haskell-src-exts"; version = "1.17.1"; sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; + revision = "1"; + editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ base containers directory filepath mtl pretty-show smallcheck syb tasty tasty-golden tasty-smallcheck ]; - jailbreak = true; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -88424,6 +88417,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_6_0_13" = callPackage + ({ mkDerivation, base, haskell-src-exts, pretty, syb + , template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.6.0.13"; + sha256 = "3f33d39d5451f3a44d348981ae5923da65cb26356d962dc9f2cb0fc64670ceb6"; + 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 @@ -89017,17 +89026,17 @@ self: { "haskellscrabble" = callPackage ({ mkDerivation, array, arrows, base, containers, directory, errors - , filepath, HUnit, mtl, parsec, QuickCheck, random, safe + , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe , semigroups, split, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, unordered-containers }: mkDerivation { pname = "haskellscrabble"; - version = "1.1"; - sha256 = "90140a7947d7df47c2a405c819f5a73c6e526aff0fc1fad0e49b29fd2fb369f1"; + version = "1.2"; + sha256 = "2ac73cbcb6327fe989dbc1293e7d58184958d7f7455a9521a353d2d5742ea8cd"; libraryHaskellDepends = [ - array arrows base containers errors mtl parsec QuickCheck random - safe semigroups split transformers unordered-containers + array arrows base containers errors listsafe mtl parsec QuickCheck + random safe semigroups split transformers unordered-containers ]; testHaskellDepends = [ base containers directory filepath HUnit QuickCheck random @@ -89090,7 +89099,6 @@ self: { homepage = "http://github.com/JoeyEremondi/haskelm"; description = "Elm to Haskell translation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskgame" = callPackage @@ -89628,7 +89636,6 @@ self: { homepage = "http://haskell.org/haskore/"; description = "The February 2000 version of Haskore"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasktags" = callPackage @@ -90075,6 +90082,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.1"; + sha256 = "be1db9c80ebdaf6f1ef0e75970e28286d435141a515ea6f83742373ffb51e330"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres_0_7_3" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bytestring, either , hashable, hashtables, hasql, hasql-backend, HTF, list-t, loch-th @@ -90411,6 +90432,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-th" = callPackage + ({ mkDerivation, attoparsec, base-prelude, bytestring, hasql + , hasql-transaction, template-haskell, text + }: + mkDerivation { + pname = "hasql-th"; + version = "0.1.0.1"; + sha256 = "170b6128b06e57675778de8b8ffe29ea0082cb8d2047d67f1fce0a5d0e45c2bf"; + libraryHaskellDepends = [ + attoparsec base-prelude bytestring hasql hasql-transaction + template-haskell text + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-th"; + description = "Template Haskell utilities for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-transaction" = callPackage ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, either, hasql @@ -90429,6 +90469,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-transaction"; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache_0_6_0" = callPackage @@ -92526,7 +92567,6 @@ self: { homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hen" = callPackage @@ -93526,8 +93566,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.1.4"; - sha256 = "27b11ffd928e4b6bbb7436e15a15ef7632170d90111e3309c37241493795bf9c"; + version = "0.1.5"; + sha256 = "e23dbba95f6f1cf9becb165c4233d5d744c8af0b57c049d4d9986d4e504658f6"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -95111,7 +95151,6 @@ self: { ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlbfgsb" = callPackage @@ -96287,7 +96326,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glpk;}; "hmatrix-gsl_0_16_0_2" = callPackage @@ -96399,7 +96437,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -96537,7 +96574,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -98439,7 +98475,6 @@ self: { homepage = "https://github.com/mikeplus64/hotswap"; description = "Simple code hotswapping"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hourglass_0_2_6" = callPackage @@ -100153,7 +100188,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -100432,7 +100466,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -100655,7 +100688,6 @@ self: { homepage = "https://github.com/skogsbaer/hscurses"; description = "NCurses bindings for Haskell"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscurses-fish-ex" = callPackage @@ -100670,7 +100702,6 @@ self: { homepage = "http://ui3.info/darcs/hscurses-fish-ex/"; description = "hscurses swimming fish example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdev_0_1_3_4" = callPackage @@ -100910,25 +100941,6 @@ self: { }) {}; "hsexif" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; - version = "0.6.0.6"; - sha256 = "19e0a298d799c72b4bff13a0c08620cd4d49fe47dc4a06b07d8fa2ce310b01d6"; - libraryHaskellDepends = [ - base binary bytestring containers iconv text time - ]; - testHaskellDepends = [ - base binary bytestring containers hspec HUnit iconv text time - ]; - homepage = "https://github.com/emmanueltouzery/hsexif"; - description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsexif_0_6_0_7" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit , iconv, text, time }: @@ -100945,7 +100957,6 @@ self: { homepage = "https://github.com/emmanueltouzery/hsexif"; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfacter" = callPackage @@ -101302,27 +101313,23 @@ self: { }) {}; "hslogger-reader" = callPackage - ({ mkDerivation, attoparsec, base, hslogger, old-locale - , optparse-applicative, text, text-icu, time + ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative + , text, text-icu, time }: mkDerivation { pname = "hslogger-reader"; - version = "1.0.0"; - sha256 = "dec424816d6b1acdff3efdf1151e97c420b0e7522376e3cafb52930c22005dad"; + version = "1.0.1"; + sha256 = "61d0b5f870ef3b5a436ad7e89a2f97ecd4c2bdd3b65998ffe4c71480313dc148"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - attoparsec base hslogger old-locale text time - ]; + libraryHaskellDepends = [ attoparsec base hslogger text time ]; executableHaskellDepends = [ - attoparsec base hslogger old-locale optparse-applicative text - text-icu time + attoparsec base hslogger optparse-applicative text text-icu time ]; jailbreak = true; homepage = "http://github.com/prophet-on-that/hslogger-reader"; description = "Parsing hslogger-produced logs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger-template" = callPackage @@ -101374,7 +101381,6 @@ self: { homepage = "https://github.com/bartavelle/hslogstash"; description = "A library to work with, or as, a logstash server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua_0_3_13" = callPackage @@ -101502,7 +101508,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -101528,7 +101533,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.Vector interface)"; license = stdenv.lib.licenses.lgpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsnock" = callPackage @@ -102722,7 +102726,6 @@ self: { testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai_0_6_2" = callPackage @@ -103252,7 +103255,6 @@ self: { homepage = "http://code.haskell.org/hstatistics"; description = "Statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstats" = callPackage @@ -106223,7 +106225,6 @@ self: { homepage = "http://justinethier.github.com/husk-scheme"; description = "R5RS Scheme interpreter, compiler, and library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husk-scheme-libs" = callPackage @@ -106240,7 +106241,6 @@ self: { homepage = "http://justinethier.github.com/husk-scheme"; description = "Extra libraries for the husk Scheme platform"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husky" = callPackage @@ -106395,7 +106395,6 @@ self: { homepage = "http://github.com/dbp/hworker"; description = "A reliable at-least-once job queue built on top of redis"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker-ses" = callPackage @@ -106414,7 +106413,6 @@ self: { homepage = "http://github.com/dbp/hworker-ses"; description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hws" = callPackage @@ -107800,7 +107798,6 @@ self: { homepage = "https://github.com/ibotty/iban"; description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ical" = callPackage @@ -108854,6 +108851,50 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_8_3_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, cmdargs, containers, directory, filepath, ghc + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, hlint, hspec + , http-client, http-client-tls, HUnit, ipython-kernel, mtl, parsec + , process, random, setenv, shelly, split, stm, strict, system-argv0 + , text, transformers, unix, unordered-containers, utf8-string, uuid + , vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.8.3.0"; + sha256 = "c486e0b6342fa6261c671ad6a891f5763f7979bc225781329fe9f913a3833107"; + revision = "1"; + editedCabalFile = "4079263fe3b633e589775753fe7e3bbab21c800fd7d54c2aa6761478c5019654"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts hlint http-client http-client-tls + ipython-kernel mtl parsec process random shelly split stm strict + system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bin-package-db bytestring containers directory ghc + ipython-kernel process strict text transformers unix + ]; + testHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts hlint hspec http-client http-client-tls + HUnit ipython-kernel mtl parsec process random setenv shelly split + stm strict system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + jailbreak = true; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -109759,7 +109800,6 @@ self: { libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -110167,8 +110207,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.7.2.0"; - sha256 = "2cd4cd0cbf47c1a6a40a9803a34f5f913520eb3e61b95a26a65bfab0e083dc34"; + version = "0.7.3.0"; + sha256 = "4de9508426ad48159502d7e2b3c241367643c8a2645f62b61d896e7b7535e329"; libraryHaskellDepends = [ aeson base bytestring data-default-class deepseq exceptions mtl pretty primitive process setenv singletons template-haskell text @@ -110700,7 +110740,6 @@ self: { homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intset" = callPackage @@ -111324,6 +111363,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_8_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, unordered-containers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.8.3.0"; + sha256 = "e865322381ddc4271fc2b0650aeee70d04036e2114e1a77921878c150af5a60c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers unordered-containers uuid + zeromq4-haskell + ]; + executableHaskellDepends = [ + base filepath mtl parsec text transformers + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -111459,7 +111523,6 @@ self: { homepage = "http://rel4tion.org/projects/irc-fun-bot/"; description = "Library for writing fun IRC bots"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-fun-client" = callPackage @@ -111543,7 +111606,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iron-mq" = callPackage @@ -111636,7 +111698,6 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "islink" = callPackage @@ -113051,7 +113112,6 @@ self: { jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -113067,7 +113127,6 @@ self: { homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsc" = callPackage @@ -114380,7 +114439,6 @@ self: { homepage = "https://github.com/ku-fpg/kansas-comet/"; description = "A JavaScript push mechanism based on the comet idiom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-lava" = callPackage @@ -114753,7 +114811,6 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-fs" = callPackage @@ -116208,7 +116265,6 @@ self: { homepage = "https://github.com/xkollar/lambda2js"; description = "Untyped Lambda calculus to JavaScript compiler"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdaBase" = callPackage @@ -118511,7 +118567,6 @@ self: { ]; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -118603,7 +118658,6 @@ self: { homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leksah-server" = callPackage @@ -118641,7 +118695,6 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lendingclub" = callPackage @@ -119825,7 +119878,6 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -119932,8 +119984,8 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.1.0.2"; - sha256 = "3df4437eb2345e46f4a2964c4c8d61b8e56ac936d63c9902227c74eed9671885"; + version = "0.2.0.0"; + sha256 = "a195549f60f88966732141a7bcab3fdfedb70bdbbb686ad3e2651518317082d5"; libraryHaskellDepends = [ base bytestring crypto-api dns network-uri pureMD5 random SHA url utf8-string @@ -119960,7 +120012,6 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage @@ -120882,7 +120933,6 @@ self: { homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage @@ -121636,7 +121686,6 @@ self: { homepage = "https://github.com/nikita-volkov/list-t-attoparsec"; description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-html-parser" = callPackage @@ -122064,7 +122113,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; "llvm-general-pure" = callPackage @@ -123323,7 +123371,6 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltl" = callPackage @@ -123637,6 +123684,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "luminance_0_8_2" = callPackage + ({ mkDerivation, base, containers, contravariant, dlist, gl, linear + , mtl, resourcet, semigroups, transformers, vector, void + }: + mkDerivation { + pname = "luminance"; + version = "0.8.2"; + sha256 = "e7ec4cb6b688077c51de48ebe4ad552e8943ad0f4a7aabfda608652c0ccfdaba"; + libraryHaskellDepends = [ + base containers contravariant dlist gl linear mtl resourcet + semigroups transformers vector void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, type-level and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "luminance-samples" = callPackage ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear , luminance, mtl, resourcet, transformers @@ -123657,6 +123722,27 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "luminance-samples_0_8" = callPackage + ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear + , luminance, mtl, resourcet, transformers + }: + mkDerivation { + pname = "luminance-samples"; + version = "0.8"; + sha256 = "35580954897bcb2fdbd7eecc14982b44f5026e64be08d7398f8cc7fa0925a962"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base contravariant GLFW-b JuicyPixels linear luminance mtl + resourcet transformers + ]; + jailbreak = true; + homepage = "https://github.com/phaazon/luminance-samples"; + description = "Luminance samples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: mkDerivation { @@ -123982,7 +124068,6 @@ self: { ]; description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mac" = callPackage @@ -125256,7 +125341,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds" = callPackage @@ -125275,7 +125359,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -125805,7 +125888,6 @@ self: { ]; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathista" = callPackage @@ -127380,7 +127462,6 @@ self: { homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi" = callPackage @@ -127547,6 +127628,7 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mighty-metropolis" = callPackage @@ -129570,7 +129652,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-skeleton" = callPackage + "monad-skeleton_0_1_2_1" = callPackage ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "monad-skeleton"; @@ -129580,9 +129662,10 @@ self: { homepage = "https://github.com/fumieval/monad-skeleton"; description = "An undead monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-skeleton_0_1_2_2" = callPackage + "monad-skeleton" = callPackage ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "monad-skeleton"; @@ -129592,7 +129675,6 @@ self: { homepage = "https://github.com/fumieval/monad-skeleton"; description = "An undead monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-st" = callPackage @@ -133099,7 +133181,6 @@ self: { homepage = "https://github.com/ivarnymoen/nanomsg-haskell"; description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nanomsg;}; "nanoparsec" = callPackage @@ -133437,7 +133518,6 @@ self: { homepage = "https://github.com/nilcons/nc-indicators"; description = "CPU load and memory usage indicators for i3bar"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ncurses" = callPackage @@ -133903,7 +133983,6 @@ self: { homepage = "http://netlink-hs.googlecode.com/"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlist" = callPackage @@ -135772,7 +135851,6 @@ self: { 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 @@ -135960,6 +136038,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nofib-analyse" = callPackage + ({ mkDerivation, array, base, containers, regex-compat }: + mkDerivation { + pname = "nofib-analyse"; + version = "7.12.0.20151208"; + sha256 = "d0ba0f82bbd0d1324e6331d75f43a0b5c1c207a3ad7df16668b730bb336725ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base containers regex-compat ]; + homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; + description = "Parse and compare nofib runs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nofib-analyze" = callPackage ({ mkDerivation, array, base, containers, regex-compat }: mkDerivation { @@ -136052,7 +136144,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "A monad and monad transformer for nondeterministic computations"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonfree" = callPackage @@ -137074,7 +137165,6 @@ self: { homepage = "http://www.github.com/massysett/ofx"; description = "Parser for OFX data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -137300,6 +137390,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "omnifmt_0_2_1_1" = callPackage + ({ mkDerivation, aeson, base, exceptions, extra, fast-logger + , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "omnifmt"; + version = "0.2.1.1"; + sha256 = "1964789180234ea2ae72fa397beab99985392dac86f527ec7866463288341731"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base exceptions extra filepath monad-logger mtl pipes text + unordered-containers yaml + ]; + executableHaskellDepends = [ + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl optparse-applicative pipes pipes-concurrency + temporary text time + ]; + homepage = "https://github.com/hjwylde/omnifmt"; + description = "A pretty-printer wrapper to faciliate ease of formatting during development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "on-a-horse" = callPackage ({ mkDerivation, arrows, base, bytestring, case-insensitive , containers, cookie, http-types, mtl, random, safe, split, text @@ -138908,7 +139025,6 @@ self: { homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -138963,7 +139079,6 @@ self: { executableHaskellDepends = [ base process ]; description = "Show keys pressed with an on-screen display (Linux only)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osm-download" = callPackage @@ -140148,8 +140263,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.5.6"; - sha256 = "0164dcfa4d23c9e5b41172ab4e14e3f6a2aad4067c9cc3e151828baeb5d5164d"; + version = "0.1.6.0"; + sha256 = "c77a309552b54bb03b7e2624dc45fdf6452dd63756f8955b5db5480df45cedf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140183,6 +140298,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pandoc-include" = callPackage + ({ mkDerivation, base, directory, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-include"; + version = "0.0.1"; + sha256 = "cdb6516356fbbd4b9ff619da0ec8f0216e01356309f75037349d56af0c9768c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory pandoc pandoc-types text + ]; + executableHaskellDepends = [ + base directory pandoc pandoc-types text + ]; + doHaddock = false; + homepage = "https://github.com/steindani/pandoc-include"; + description = "Include other Markdown files"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-lens" = callPackage ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { @@ -140901,7 +141036,6 @@ self: { homepage = "https://github.com/aslatter/parsec2"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec3" = callPackage @@ -141374,7 +141508,6 @@ self: { homepage = "https://github.com/liamoc/patches-vector"; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path_0_5_2" = callPackage @@ -142005,7 +142138,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -144748,7 +144880,6 @@ self: { homepage = "https://github.com/sdiehl/picologic"; description = "Utilities for symbolic predicate logic expressions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picoparsec_0_1_2_1" = callPackage @@ -146246,7 +146377,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk-ui" = callPackage @@ -146263,7 +146393,6 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3_0_1" = callPackage @@ -146309,7 +146438,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-lab" = callPackage @@ -146327,7 +146455,6 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-lab"; description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -146368,7 +146495,6 @@ self: { homepage = "http://hub.darcs.net/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plugins-auto" = callPackage @@ -146969,7 +147095,6 @@ self: { libraryHaskellDepends = [ base vector ]; description = "A solver for systems of polynomial equations in bernstein form"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polyparse_1_9" = callPackage @@ -147279,7 +147404,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs"; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; @@ -147801,8 +147925,8 @@ self: { }: mkDerivation { pname = "postgresql-orm"; - version = "0.4.0"; - sha256 = "06ad6a6dc84eaf7cda7c9dc1973e9ed9e1f16d78926d9cf029e0c3a8e3dbf5ef"; + version = "0.4.1"; + sha256 = "649d995c7eb7890b2826cda2d930651a0906e9ce0173342180d83e5527dc7b5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147869,6 +147993,28 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-schema_0_1_9" = callPackage + ({ mkDerivation, base, basic-prelude, optparse-applicative + , postgresql-simple, shelly, text, time, time-locale-compat + }: + mkDerivation { + pname = "postgresql-schema"; + version = "0.1.9"; + sha256 = "18d0262e69b6d02beaf016fd1ee6c25533a59e688bd21f1acc5b07c6a787d7ec"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude postgresql-simple shelly text + ]; + executableHaskellDepends = [ + base basic-prelude optparse-applicative shelly text time + time-locale-compat + ]; + homepage = "https://github.com/mfine/postgresql-schema"; + description = "PostgreSQL Schema Management"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -149966,7 +150112,6 @@ self: { homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-client" = callPackage @@ -152166,7 +152311,6 @@ self: { homepage = "http://github.com/audreyt/quickcheck-regex/"; description = "Generate regex-constrained strings for QuickCheck"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-relaxng" = callPackage @@ -152183,7 +152327,6 @@ self: { homepage = "http://github.com/audreyt/quickcheck-relaxng/"; description = "Generate RelaxNG-constrained XML documents for QuickCheck"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-rematch" = callPackage @@ -152404,8 +152547,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "quiver"; - version = "1.1.2"; - sha256 = "fc4e05e7514e42ef12dbc58a471825ffc3208d1b073a86940a0c7b8207a8dfa6"; + version = "1.1.3"; + sha256 = "fdf0a4aabc5787e4e9f512485bea9771885dcab0482ef811e68189962d15e0bd"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -153394,7 +153537,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/raven-haskell"; description = "Haskell client for Sentry logging service"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell-scotty" = callPackage @@ -154172,7 +154314,6 @@ self: { homepage = "https://github.com/joeyadams/haskell-recursive-line-count"; description = "Count lines in files and display them hierarchically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redHandlers" = callPackage @@ -155132,7 +155273,6 @@ self: { homepage = "https://github.com/audreyt/regex-genex"; description = "From a regex, generate all possible strings it can match"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-parsec" = callPackage @@ -155855,7 +155995,6 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -156404,7 +156543,6 @@ self: { ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-stream" = callPackage @@ -157364,7 +157502,6 @@ self: { homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-gen_0_16_1_3" = callPackage @@ -158977,8 +159114,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.3"; - sha256 = "78ba2581d0ee590a335bc595a01f85d8e88c0ca9803e24a5aaf1520cd75c3114"; + version = "0.4.1.4"; + sha256 = "cc927bf848469fba0e594c5b9e46d822d410a29c978773924bb4b3268882b3a1"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -158986,7 +159123,6 @@ self: { attoparsec base bytestring directory heredoc hspec QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/meanpath/robots"; description = "Parser for robots.txt"; license = stdenv.lib.licenses.bsd3; @@ -159671,8 +159807,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.1.2"; - sha256 = "c970dc6c60f0a72669fd2f87bab4f3bba57eb7336d3851dda18db6ccc0d18576"; + version = "0.1.3"; + sha256 = "8ee905a36562c93b0bd60d799eb85d59795c775497411120324fa104b13943ab"; libraryHaskellDepends = [ array base basic-prelude binary binary-bits bytestring lens template-haskell word24 @@ -159681,6 +159817,7 @@ self: { homepage = "http://github.com/swift-nav/librtcm"; description = "RTCM Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtld" = callPackage @@ -160276,7 +160413,6 @@ self: { ]; description = "overflow-checked Int type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safer-file-handles" = callPackage @@ -160860,8 +160996,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "0.51.6"; - sha256 = "f35ac09599df5aec19f49c24fa3a51b7b2a9268699cdce2438354fd477f9f4b7"; + version = "0.52.0"; + sha256 = "b4c4629044e230c950b5a71c7baf1226bec6ea68415d9e9c82b6c69f8fbddd7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160974,6 +161110,7 @@ self: { homepage = "http://github.com/LeventErkok/sbvPlugin"; description = "Analyze Haskell expressions using SBV/SMT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc3-rdu" = callPackage @@ -161132,7 +161269,6 @@ self: { homepage = "https://github.com/redelmann/scat"; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -161658,7 +161794,6 @@ self: { homepage = "http://github.com/JPMoresmau/scion-class-browser"; description = "Command-line interface for browsing and searching packages documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scons2dot" = callPackage @@ -162142,7 +162277,6 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdf2p1-parser" = callPackage @@ -162288,7 +162422,6 @@ self: { executableHaskellDepends = [ base sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -164755,7 +164888,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -165072,7 +165204,6 @@ self: { homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfml-audio" = callPackage @@ -166118,7 +166249,6 @@ self: { ]; description = "Test webhooks locally"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-conduit_4_5" = callPackage @@ -166472,6 +166602,7 @@ self: { process system-fileio system-filepath text time transformers transformers-base unix-compat ]; + doCheck = false; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -167955,7 +168086,6 @@ self: { homepage = "https://github.com/konn/sized-vector"; description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sizes" = callPackage @@ -168755,7 +168885,6 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp-mail" = callPackage @@ -169337,7 +169466,6 @@ self: { ]; description = "Serve Elm files through the Snap web framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-error-collector" = callPackage @@ -170011,7 +170139,6 @@ self: { homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - Snap Web Framework adaptor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-mandrill" = callPackage @@ -170566,7 +170693,6 @@ self: { homepage = "http://sneathlane.com"; description = "A compositional web UI library, which draws to a Canvas element"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snippet-extractor" = callPackage @@ -170971,7 +171097,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "GUI functions as used in the book \"The Haskell School of Expression\""; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -171160,6 +171285,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sourcemap_0_1_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "sourcemap"; + version = "0.1.5"; + sha256 = "cf64d8ff9a38d2feb134814fd0cb5b9f171d650c7d74a8277238bb88d0f562ea"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring process text unordered-containers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring process text unordered-containers utf8-string + ]; + description = "Implementation of source maps as proposed by Google and Mozilla"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sousit" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, QuickCheck , resourcet, stm, test-framework, test-framework-quickcheck2 @@ -172382,7 +172527,6 @@ self: { homepage = "https://github.com/jekor/haskell-sscgi"; description = "Simple SCGI Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ssh" = callPackage @@ -174601,6 +174745,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm-conduit_2_7_0" = callPackage + ({ mkDerivation, async, base, cereal, cereal-conduit, conduit + , conduit-combinators, conduit-extra, directory, doctest, ghc-prim + , HUnit, lifted-async, lifted-base, monad-control, monad-loops + , QuickCheck, resourcet, stm, stm-chans, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + , void + }: + mkDerivation { + pname = "stm-conduit"; + version = "2.7.0"; + sha256 = "e3ec32b7b150449f45b55b18dce8a6607177c948824dcffb935c721abba7c5af"; + libraryHaskellDepends = [ + async base cereal cereal-conduit conduit conduit-combinators + conduit-extra directory ghc-prim lifted-async lifted-base + monad-control monad-loops resourcet stm stm-chans transformers void + ]; + testHaskellDepends = [ + base conduit conduit-combinators directory doctest HUnit QuickCheck + resourcet stm stm-chans test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "https://github.com/wowus/stm-conduit"; + description = "Introduces conduits to channels, and promotes using conduits concurrently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-containers_0_2_4" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive @@ -174761,6 +174933,25 @@ self: { testHaskellDepends = [ base hspec HUnit stm ]; description = "Conduits and STM operations for fire hoses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "stm-firehose_0_3_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types + , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai + , wai-conduit, warp + }: + mkDerivation { + pname = "stm-firehose"; + version = "0.3.0.2"; + sha256 = "6519b3fa7eba570e0cbd39ebb1b99eedf27212d3a1d3f63be5758e74858ed7f8"; + libraryHaskellDepends = [ + base blaze-builder conduit http-types resourcet stm stm-chans + stm-conduit transformers wai wai-conduit warp + ]; + testHaskellDepends = [ base hspec HUnit stm ]; + homepage = "https://github.com/bartavelle/stm-firehose"; + description = "Conduits and STM operations for fire hoses"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -176620,12 +176811,16 @@ self: { }) {}; "success" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base + }: mkDerivation { pname = "success"; - version = "0.2.1.1"; - sha256 = "38bcdba849f45ddc7a417f064ac1db2e580000682299f9ab91bdd5a22ef033a4"; - libraryHaskellDepends = [ base ]; + version = "0.2.2"; + sha256 = "0c1d6936db654b732c3eee92090b0454d0e0734308e07b28d52d22b25c54c859"; + libraryHaskellDepends = [ + base monad-control mtl transformers transformers-base + ]; homepage = "https://github.com/nikita-volkov/success"; description = "A version of Either specialised for encoding of success or failure"; license = stdenv.lib.licenses.mit; @@ -177526,7 +177721,6 @@ self: { homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synchronous-channels" = callPackage @@ -179495,7 +179689,6 @@ self: { homepage = "http://github.com/nomeata/tasty-expected-failure"; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-fail-fast" = callPackage @@ -180205,26 +180398,6 @@ self: { }) {}; "tellbot" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, containers - , http-conduit, mtl, network, regex-pcre, split, tagsoup, text - , time, transformers - }: - mkDerivation { - pname = "tellbot"; - version = "0.6.0.8"; - sha256 = "69025b8765f5383e8060c709875c5b704edb66508287b33099c8301f1e074104"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bifunctors bytestring containers http-conduit mtl network - regex-pcre split tagsoup text time transformers - ]; - homepage = "https://github.com/phaazon/tellbot"; - description = "IRC tellbot"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tellbot_0_6_0_10" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text , time, transformers @@ -180242,7 +180415,6 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -180349,7 +180521,6 @@ self: { homepage = "https://github.com/jekor/templatepg"; description = "A PostgreSQL access library with compile-time SQL type inference"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "templater" = callPackage @@ -180751,7 +180922,6 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework_0_8_0_3" = callPackage @@ -182195,7 +182365,6 @@ self: { libraryHaskellDepends = [ array base ]; description = "Plot functions in text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "textmatetags" = callPackage @@ -182392,7 +182561,6 @@ self: { homepage = "https://github.com/seereason/th-context"; description = "Test instance context"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-desugar_1_4_2" = callPackage @@ -183224,7 +183392,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -183284,7 +183451,6 @@ self: { homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thrist" = callPackage @@ -183408,7 +183574,6 @@ self: { homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "tic-tac-toe" = callPackage @@ -183953,6 +184118,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timemap" = callPackage + ({ mkDerivation, base, containers, hashable, hashtables, QuickCheck + , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck + , time, unordered-containers + }: + mkDerivation { + pname = "timemap"; + version = "0.0.0"; + sha256 = "f0b85eca4fdea0270897e0b15675f7894b193695968ddb6ac5f7acff73b64cc6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable hashtables stm time unordered-containers + ]; + executableHaskellDepends = [ + base containers hashable hashtables stm time unordered-containers + ]; + testHaskellDepends = [ + base containers hashable hashtables QuickCheck quickcheck-instances + stm tasty tasty-hunit tasty-quickcheck time unordered-containers + ]; + description = "A mutable hashmap, implicitly indexed by UTCTime"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timeout" = callPackage ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty , tasty-quickcheck, time @@ -184305,7 +184495,6 @@ self: { homepage = "http://tip-org.github.io"; description = "tons of inductive problems - support library and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "titlecase" = callPackage @@ -185245,6 +185434,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tracy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tracy"; + version = "0.1.0.0"; + sha256 = "33e4e073bead5fa93236a23e47ab76ca6b38a74d33ada8af25a84ae446e1c3d9"; + libraryHaskellDepends = [ base ]; + description = "Convenience wrappers for non-intrusive debug tracing"; + license = stdenv.lib.licenses.mit; + }) {}; + "trajectory" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs , containers, http-enumerator, http-types, regexpr, text @@ -185733,7 +185933,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Treeviz"; description = "Visualization of computation decomposition trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tremulous-query" = callPackage @@ -185802,7 +186001,6 @@ self: { ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trifecta_1_5_1_3" = callPackage @@ -185940,7 +186138,6 @@ self: { homepage = "https://github.com/liyang/true-name"; description = "Template Haskell hack to violate another module's abstractions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "truelevel" = callPackage @@ -186288,7 +186485,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Homogeneous tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple" = callPackage @@ -186910,7 +187106,6 @@ self: { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -187019,7 +187214,6 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -187036,7 +187230,6 @@ self: { homepage = "https://github.com/himura/twitter-types-lens"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -187481,7 +187674,6 @@ self: { homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-ord" = callPackage @@ -187848,7 +188040,6 @@ self: { ]; description = "Drawings for printed text documents"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tz" = callPackage @@ -188770,7 +188961,6 @@ self: { homepage = "http://code.haskell.org/~thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -189643,7 +189833,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "uri-bytestring" = callPackage + "uri-bytestring_0_1_9_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups , tasty, tasty-hunit, tasty-quickcheck @@ -189663,6 +189853,29 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.1.9.2"; + sha256 = "3d51236d957c656f38ebc2f01f256130b8bc48166539d477803295bdffcc5bb0"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring derive HUnit lens + QuickCheck quickcheck-instances semigroups tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; }) {}; "uri-conduit" = callPackage @@ -190415,7 +190628,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc" = callPackage @@ -191076,7 +191288,6 @@ self: { homepage = "https://github.com/NICTA/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -191398,7 +191609,6 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -192297,7 +192507,6 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -192387,20 +192596,23 @@ self: { }) {}; "vinyl-vectors" = callPackage - ({ mkDerivation, base, constraints, primitive, text, vector, vinyl + ({ mkDerivation, base, bytestring, constraints, data-default + , primitive, template-haskell, text, vector, vinyl }: mkDerivation { pname = "vinyl-vectors"; - version = "0.1.0.3"; - sha256 = "e439e9b8045d71c898a7aad388322594cc52399b60588bfcec1116b2cb179afe"; + version = "0.2.0"; + sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base constraints primitive text vector vinyl + base bytestring constraints data-default primitive template-haskell + text vector vinyl ]; homepage = "http://github.com/andrewthad/vinyl-vectors"; description = "Vectors for vinyl vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "virthualenv" = callPackage @@ -192646,7 +192858,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage @@ -192888,7 +193099,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai" = callPackage + "wai_3_0_4_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text , transformers, unix-compat, vault @@ -192907,6 +193118,26 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring + , bytestring-builder, hspec, http-types, network, text + , transformers, unix-compat, vault + }: + mkDerivation { + pname = "wai"; + version = "3.0.5.0"; + sha256 = "0e417e6e8eff087585c0079917e6141a4e006fcd6cb736d1c6b49c503e9a08f3"; + libraryHaskellDepends = [ + base blaze-builder bytestring bytestring-builder http-types network + text transformers unix-compat vault + ]; + testHaskellDepends = [ base blaze-builder bytestring hspec ]; + homepage = "https://github.com/yesodweb/wai"; + description = "Web Application Interface"; + license = stdenv.lib.licenses.mit; }) {}; "wai-app-file-cgi" = callPackage @@ -194398,6 +194629,36 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "wai-middleware-crowd_0_1_3" = callPackage + ({ mkDerivation, authenticate, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, clientsession + , containers, cookie, gitrev, http-client, http-client-tls + , http-reverse-proxy, http-types, optparse-applicative, resourcet + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-crowd"; + version = "0.1.3"; + sha256 = "ae39aacc5cad59ff26053e8650b8dde3d4432efa6176ef2101501fe8d0008704"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + authenticate base base64-bytestring binary blaze-builder bytestring + case-insensitive clientsession containers cookie http-client + http-client-tls http-types resourcet text time unix-compat vault + wai + ]; + executableHaskellDepends = [ + base bytestring clientsession gitrev http-client http-client-tls + http-reverse-proxy http-types optparse-applicative template-haskell + text transformers wai wai-app-static wai-extra warp + ]; + description = "Middleware and utilities for using Atlassian Crowd authentication"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -194414,7 +194675,6 @@ self: { homepage = "https://github.com/ameingast/wai-middleware-etag"; description = "WAI ETag middleware for static files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-gunzip" = callPackage @@ -194934,6 +195194,22 @@ self: { license = "unknown"; }) {}; + "wai-session-alt" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, cookie + , http-types, time, vault, wai-transformers + }: + mkDerivation { + pname = "wai-session-alt"; + version = "0.0.0"; + sha256 = "89408d5ef5371e8e855ad02cdb056fb375bd1dd024bdd34d961b75fc1ce6c337"; + libraryHaskellDepends = [ + base blaze-builder bytestring cookie http-types time vault + wai-transformers + ]; + description = "An alternative session middleware for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-session-clientsession" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession, errors , transformers, wai-session @@ -196024,28 +196300,28 @@ self: { ({ 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 + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, simple-sendfile, stm, streaming-commons, text, time + , transformers, unix, unix-compat, unordered-containers, vault, wai + , word8 }: mkDerivation { pname = "warp"; - version = "3.1.9"; - sha256 = "53cd0f79fb164f6c79c31f23ffb8cd0037d47ea3c7cd1448f9cb84fe9150dd82"; + version = "3.1.10"; + sha256 = "c0b60aca4a6c10f7b6f00e2e17e5ba5f04ffefb287123541459436bfd22c4fd5"; 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 + unix unix-compat unordered-containers 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 + iproute lifted-base network process QuickCheck simple-sendfile stm + streaming-commons text time transformers unix unix-compat + unordered-containers vault wai word8 ]; doCheck = false; homepage = "http://github.com/yesodweb/wai"; @@ -196867,23 +197143,31 @@ self: { }) {}; "webapp" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bcrypt + ({ mkDerivation, alex, attoparsec, base, base16-bytestring, bcrypt , blaze-builder, bytestring, cryptohash, css-text, data-default - , directory, filepath, fsnotify, hashtables, hjsmin, http-types - , mime-types, mtl, optparse-applicative, scotty, stm, text, time - , transformers, unix, unordered-containers, wai, wai-extra, warp - , warp-tls, zlib + , directory, filepath, fsnotify, happy, hashtables, hjsmin + , http-types, mime-types, mtl, network, optparse-applicative + , scotty, stm, streaming-commons, text, time, transformers, unix + , unordered-containers, wai, wai-extra, warp, warp-tls, zlib }: mkDerivation { pname = "webapp"; - version = "0.0.2"; - sha256 = "00730f9cf3fc3cac2832c47b0b59b90b709200cbf71ec7c5b3b2f9c56ed859ca"; + version = "0.1.0"; + sha256 = "e7c3f6ebbd9f254f8d9323e240a6029bafcbb0c2e86e4d7a8f45e42255704a3f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base base16-bytestring bcrypt blaze-builder bytestring cryptohash css-text data-default directory filepath fsnotify - hashtables hjsmin http-types mime-types mtl optparse-applicative - scotty stm text time transformers unix unordered-containers wai - wai-extra warp warp-tls zlib + hashtables hjsmin http-types mime-types mtl network + optparse-applicative scotty stm streaming-commons text time + transformers unix unordered-containers wai wai-extra warp warp-tls + zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base bytestring http-types optparse-applicative scotty text + transformers ]; homepage = "https://github.com/fhsjaagshs/webapp"; description = "Haskell web scaffolding using Scotty, WAI, and Warp"; @@ -197287,7 +197571,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage @@ -197319,7 +197602,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -197335,7 +197617,6 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webpage_0_0_3_1" = callPackage @@ -198420,7 +198701,6 @@ self: { homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "woot" = callPackage @@ -199028,7 +199308,6 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -199485,7 +199764,6 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-validation_1_5_1" = callPackage @@ -199743,7 +200021,6 @@ self: { executableHaskellDepends = [ base cairo graphviz gtk text ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -200779,6 +201056,7 @@ self: { homepage = "https://github.com/sannsyn/xml-query-xml-conduit"; description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-query-xml-types" = callPackage @@ -200803,6 +201081,7 @@ self: { homepage = "https://github.com/sannsyn/xml-query-xml-types"; description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-to-json" = callPackage @@ -201255,7 +201534,6 @@ self: { homepage = "https://github.com/supki/xmonad-screenshot"; description = "Workspaces screenshooting utility for XMonad"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-utils" = callPackage @@ -203201,7 +203479,6 @@ self: { homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-basic" = callPackage @@ -204637,39 +204914,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.15"; - sha256 = "85d132bf823a8638db38aace4770c8e4bf1de9fcd39f91f6537e17ae6a04a4d6"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat unix-compat unordered-containers - wai wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-bin_1_4_16_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -204700,7 +204944,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -206191,7 +206434,6 @@ self: { homepage = "https://github.com/mgsloan/yesod-media-simple"; description = "Simple display of media types, served by yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed_1_4_0" = callPackage @@ -206293,7 +206535,6 @@ self: { homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-persistent_1_4_0_1" = callPackage @@ -207571,7 +207812,6 @@ self: { homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -207623,7 +207863,6 @@ self: { homepage = "https://github.com/yi-editor/yi-fuzzy-open"; description = "Fuzzy open plugin for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -207674,7 +207913,6 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -207708,7 +207946,6 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -207721,7 +207958,6 @@ self: { homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -207735,7 +207971,6 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-vty" = callPackage @@ -208041,7 +208276,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "z3" = callPackage From 50093df8f9b0faea9095cd7a4540ba3a0671c8fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Dec 2015 14:54:03 +0100 Subject: [PATCH 153/498] configuration-hackage2nix.yaml: update list of broken builds --- .../configuration-hackage2nix.yaml | 265 +----------------- 1 file changed, 10 insertions(+), 255 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d5bc64a4f6d..ffba1d42664 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -150,9 +150,7 @@ dont-distribute-packages: abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -206,7 +204,6 @@ dont-distribute-packages: algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -278,7 +275,6 @@ dont-distribute-packages: ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] - ASN1: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -310,10 +306,8 @@ dont-distribute-packages: awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -322,8 +316,6 @@ dont-distribute-packages: aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -419,9 +411,7 @@ dont-distribute-packages: BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -438,7 +428,6 @@ dont-distribute-packages: bits-extras: [ x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ 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 ] bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-vector: [ i686-linux ] @@ -461,7 +450,6 @@ dont-distribute-packages: blubber: [ x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] - bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] BNFC: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -470,7 +458,6 @@ dont-distribute-packages: boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - brainfuck-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -492,7 +479,6 @@ dont-distribute-packages: buster: [ i686-linux, x86_64-linux, x86_64-darwin ] Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -520,14 +506,12 @@ dont-distribute-packages: cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] - cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -539,7 +523,6 @@ dont-distribute-packages: cap: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -568,7 +551,6 @@ dont-distribute-packages: cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -585,8 +567,6 @@ dont-distribute-packages: charade: [ i686-linux, x86_64-linux, x86_64-darwin ] charsetdetect-ae: [ x86_64-darwin ] charsetdetect: [ x86_64-darwin ] - Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -610,7 +590,6 @@ dont-distribute-packages: citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] cityhash: [ x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] - clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -632,7 +611,6 @@ dont-distribute-packages: clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -645,7 +623,6 @@ dont-distribute-packages: cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -675,12 +652,10 @@ dont-distribute-packages: comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-ltr: [ 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 ] @@ -697,8 +672,6 @@ dont-distribute-packages: conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-audio-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-iconv: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -713,7 +686,6 @@ dont-distribute-packages: consumers: [ x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] - continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -726,16 +698,11 @@ dont-distribute-packages: contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-c99: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-sbv: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] - CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -777,15 +744,10 @@ dont-distribute-packages: crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] csp: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -797,8 +759,6 @@ dont-distribute-packages: curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] @@ -826,7 +786,6 @@ dont-distribute-packages: datadog: [ i686-linux ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-named: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -856,7 +815,6 @@ dont-distribute-packages: ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-source-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - Deadpan-DDP: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -898,11 +856,9 @@ dont-distribute-packages: dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -925,16 +881,8 @@ dont-distribute-packages: discount: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -974,14 +922,12 @@ dont-distribute-packages: ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1010,7 +956,6 @@ dont-distribute-packages: edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] edge: [ i686-linux, x86_64-linux, x86_64-darwin ] - EdisonCore: [ i686-linux, x86_64-linux, x86_64-darwin ] edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1050,8 +995,6 @@ dont-distribute-packages: epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - equational-reasoning: [ i686-linux, x86_64-linux, x86_64-darwin ] - erlang: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1075,10 +1018,8 @@ dont-distribute-packages: eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1091,7 +1032,6 @@ dont-distribute-packages: extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] - external-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] factory: [ i686-linux ] @@ -1151,7 +1091,6 @@ dont-distribute-packages: fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixplate: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1165,7 +1104,6 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1196,10 +1134,8 @@ dont-distribute-packages: Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - FPretty: [ i686-linux, x86_64-linux, x86_64-darwin ] Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ] frag: [ i686-linux, x86_64-linux, x86_64-darwin ] - frame-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1219,7 +1155,6 @@ dont-distribute-packages: friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gloss: [ x86_64-darwin ] - frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1230,7 +1165,6 @@ dont-distribute-packages: full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1239,11 +1173,9 @@ dont-distribute-packages: funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1251,7 +1183,6 @@ dont-distribute-packages: gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] gearbox: [ x86_64-darwin ] - GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1276,10 +1207,8 @@ dont-distribute-packages: GenussFold: [ i686-linux ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] - geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1287,47 +1216,30 @@ dont-distribute-packages: getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-exactprint: [ x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-fmt: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1342,7 +1254,6 @@ dont-distribute-packages: GLHUI: [ x86_64-darwin ] glicko: [ 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 ] @@ -1433,33 +1344,19 @@ dont-distribute-packages: gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-jsinput: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-largeTreeStore: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-simple-list-view: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-toggle-button-list: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-traymanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - GtkTV: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1493,8 +1390,6 @@ dont-distribute-packages: haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hails-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - hails: [ i686-linux, x86_64-linux, x86_64-darwin ] hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1502,13 +1397,11 @@ dont-distribute-packages: hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] HaLeX: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] - halma: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1591,15 +1484,10 @@ dont-distribute-packages: haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-exp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-gi-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-mpi: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1616,7 +1504,6 @@ dont-distribute-packages: haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelm: [ i686-linux, x86_64-linux, x86_64-darwin ] haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1637,10 +1524,12 @@ dont-distribute-packages: haskore-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore-vintage: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1700,7 +1589,6 @@ dont-distribute-packages: hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] helm: [ i686-linux, x86_64-linux, x86_64-darwin ] hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] - hemokit: [ i686-linux, x86_64-linux, x86_64-darwin ] henet: [ i686-linux, x86_64-linux, x86_64-darwin ] hen: [ i686-linux, x86_64-linux, x86_64-darwin ] hepevt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1798,7 +1686,6 @@ dont-distribute-packages: hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1817,8 +1704,6 @@ dont-distribute-packages: hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-gsl-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1827,7 +1712,6 @@ dont-distribute-packages: hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1885,7 +1769,6 @@ dont-distribute-packages: hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1925,7 +1808,6 @@ dont-distribute-packages: hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1935,15 +1817,12 @@ dont-distribute-packages: hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscurses-fish-ex: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscurses: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1971,17 +1850,13 @@ dont-distribute-packages: hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1993,7 +1868,6 @@ dont-distribute-packages: hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2010,7 +1884,6 @@ dont-distribute-packages: hsqml: [ x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstatistics: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2033,7 +1906,6 @@ dont-distribute-packages: HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] htaglib: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2063,16 +1935,11 @@ dont-distribute-packages: hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] - hXmixer: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2099,7 +1966,6 @@ dont-distribute-packages: hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - iban: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2129,7 +1995,6 @@ dont-distribute-packages: incremental-sat-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] index-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - indian-language-font-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2151,7 +2016,6 @@ dont-distribute-packages: internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - intricacy: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2162,11 +2026,8 @@ dont-distribute-packages: ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ireal: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - isiz: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2209,8 +2070,6 @@ dont-distribute-packages: 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 ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2235,7 +2094,6 @@ dont-distribute-packages: JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2246,7 +2104,6 @@ dont-distribute-packages: keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-solutions-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-view-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2282,7 +2139,6 @@ dont-distribute-packages: labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] laika: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2296,7 +2152,6 @@ dont-distribute-packages: lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2340,9 +2195,6 @@ dont-distribute-packages: leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell: [ x86_64-darwin ] @@ -2363,12 +2215,10 @@ dont-distribute-packages: libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - libnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-journal: [ x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2388,7 +2238,6 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2407,7 +2256,6 @@ dont-distribute-packages: lio-fs: [ x86_64-darwin ] lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2420,7 +2268,6 @@ dont-distribute-packages: llvm-data-interop: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2454,7 +2301,6 @@ dont-distribute-packages: LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2469,7 +2315,6 @@ dont-distribute-packages: 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 ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2494,8 +2339,6 @@ dont-distribute-packages: manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2508,7 +2351,6 @@ dont-distribute-packages: masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] - mathgenealogy: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2543,10 +2385,10 @@ dont-distribute-packages: Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] - mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-alsa: [ x86_64-darwin ] midimory: [ x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] + mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mikmod: [ x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2670,12 +2512,10 @@ dont-distribute-packages: nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg: [ x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] - nc-indicators: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] needle: [ i686-linux, x86_64-linux, x86_64-darwin ] nehe-tuts: [ x86_64-darwin ] @@ -2686,7 +2526,6 @@ dont-distribute-packages: nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlink: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2718,7 +2557,6 @@ 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 ] nixfromnpm: [ 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 ] @@ -2730,7 +2568,6 @@ dont-distribute-packages: Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] - nondeterminism: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2761,7 +2598,6 @@ dont-distribute-packages: octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] OddWord: [ i686-linux ] - 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 ] @@ -2806,11 +2642,8 @@ dont-distribute-packages: OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] - OrderedBits: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - origami: [ i686-linux, x86_64-linux, x86_64-darwin ] - osdkeys: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2835,7 +2668,6 @@ dont-distribute-packages: parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parport: [ x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec2: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2846,7 +2678,6 @@ 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 ] @@ -2855,7 +2686,6 @@ dont-distribute-packages: pb: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2891,7 +2721,6 @@ dont-distribute-packages: phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2907,14 +2736,8 @@ dont-distribute-packages: planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] plat: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2927,7 +2750,6 @@ dont-distribute-packages: polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ x86_64-darwin ] - polynomials-bernstein: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2938,7 +2760,6 @@ dont-distribute-packages: pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] portaudio: [ x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2948,7 +2769,6 @@ dont-distribute-packages: posix-realtime: [ x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2966,7 +2786,6 @@ dont-distribute-packages: prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2994,7 +2813,6 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] - prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3041,8 +2859,6 @@ dont-distribute-packages: QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3073,7 +2889,6 @@ dont-distribute-packages: rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ x86_64-darwin ] - raven-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3097,7 +2912,6 @@ dont-distribute-packages: record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3111,7 +2925,6 @@ dont-distribute-packages: reflex-gloss-scene: [ x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3132,7 +2945,6 @@ dont-distribute-packages: rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3140,7 +2952,6 @@ dont-distribute-packages: repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3152,7 +2963,6 @@ dont-distribute-packages: resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] respond: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3203,6 +3013,7 @@ dont-distribute-packages: rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] rtlsdr: [ x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rubberband: [ x86_64-darwin ] @@ -3212,7 +3023,6 @@ dont-distribute-packages: RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] - safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3240,16 +3050,16 @@ dont-distribute-packages: sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - scat: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + SciFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] scope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3264,11 +3074,9 @@ dont-distribute-packages: scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-cairo: [ x86_64-darwin ] sdl2-compositor: [ x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2: [ x86_64-darwin ] SDL-gfx: [ x86_64-darwin ] SDL-image: [ x86_64-darwin ] @@ -3308,14 +3116,12 @@ dont-distribute-packages: 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 ] - servius: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sext: [ i686-linux, x86_64-linux, x86_64-darwin ] sfml-audio: [ x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3331,7 +3137,6 @@ dont-distribute-packages: shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-compatline: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3372,7 +3177,6 @@ dont-distribute-packages: sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3386,13 +3190,11 @@ dont-distribute-packages: smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] sme: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtlib2: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-actionlog: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-css-min: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3401,7 +3203,6 @@ dont-distribute-packages: snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-lss: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3420,7 +3221,6 @@ dont-distribute-packages: snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snowglobe: [ x86_64-darwin ] @@ -3431,7 +3231,6 @@ dont-distribute-packages: sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] - soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] SoOSiM: [ i686-linux, x86_64-linux, x86_64-darwin ] sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3472,7 +3271,6 @@ dont-distribute-packages: sql-simple-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] - sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3491,7 +3289,6 @@ dont-distribute-packages: stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] stopwatch: [ x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3535,7 +3332,6 @@ dont-distribute-packages: sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3574,7 +3370,6 @@ dont-distribute-packages: tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-expected-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3588,7 +3383,6 @@ dont-distribute-packages: template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] - templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3597,7 +3391,6 @@ dont-distribute-packages: termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] - tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3611,13 +3404,11 @@ dont-distribute-packages: text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] - textPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tftp: [ x86_64-darwin ] - th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] thih: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3625,11 +3416,8 @@ dont-distribute-packages: Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3654,7 +3442,6 @@ dont-distribute-packages: TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3681,21 +3468,17 @@ dont-distribute-packages: transient: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] - treeviz: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tries: [ i686-linux, x86_64-linux, x86_64-darwin ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] - true-name: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3712,11 +3495,8 @@ dont-distribute-packages: twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] twitch: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3734,7 +3514,6 @@ dont-distribute-packages: type-level: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3744,7 +3523,6 @@ dont-distribute-packages: type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - typography-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] tz: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3763,7 +3541,6 @@ dont-distribute-packages: uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3793,7 +3570,6 @@ dont-distribute-packages: utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-tc: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3803,14 +3579,12 @@ dont-distribute-packages: vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - validation: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcache-trie: [ x86_64-darwin ] vcache: [ x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ x86_64-darwin ] @@ -3827,22 +3601,20 @@ dont-distribute-packages: verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] versions: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3857,7 +3629,6 @@ dont-distribute-packages: 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 ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3885,9 +3656,6 @@ dont-distribute-packages: webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3916,7 +3684,6 @@ dont-distribute-packages: 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 ] word24: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3935,7 +3702,6 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] wxcore: [ x86_64-darwin ] wxc: [ x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3950,11 +3716,9 @@ dont-distribute-packages: X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] - x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] xattr: [ x86_64-darwin ] xbattbar: [ x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3975,6 +3739,8 @@ dont-distribute-packages: xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3983,7 +3749,6 @@ dont-distribute-packages: xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-utils: [ x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4019,7 +3784,6 @@ dont-distribute-packages: yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4031,10 +3795,8 @@ dont-distribute-packages: yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4052,13 +3814,7 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-fuzzy-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-rope: [ x86_64-darwin ] - yi-snippet: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4068,7 +3824,6 @@ dont-distribute-packages: yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux ] - yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] z3: [ x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] From 4cca974eb680177a56693d95f65d3b61804e515f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Dec 2015 14:40:52 +0100 Subject: [PATCH 154/498] ghc: add version 7.10.3 --- pkgs/development/compilers/ghc/7.10.3.nix | 70 +++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.10.3.nix diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix new file mode 100644 index 00000000000..32d6b72970c --- /dev/null +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +}: + +let + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + ${stdenv.lib.optionalString stdenv.isDarwin '' + libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" + libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" + ''} + ''; + +in + +stdenv.mkDerivation rec { + version = "7.10.3"; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; + sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; + }; + + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + + enableParallelBuilding = true; + + preConfigure = '' + echo >mk/build.mk "${buildMK}" + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/cc" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + done + ''; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a4349e643e..9b3f3e66854 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -37,6 +37,9 @@ rec { ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); + ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); From 770b264c9622578f91e029b9e237a7eef7280d4f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Dec 2015 18:20:16 +0100 Subject: [PATCH 155/498] Fix Haskell evaluation errors on Hydra. --- .../haskell-modules/configuration-common.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bfae6b2cda..b216764ff31 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -114,7 +114,24 @@ self: super: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; doCheck = false; - }); + }); + + # Depends on broken "lss" package. + snaplet-lss = dontDistribute super.snaplet-lss; + + # Depends on broken "NewBinary" package. + ASN1 = dontDistribute super.ASN1; + + # Depends on broken "frame" package. + frame-markdown = dontDistribute super.frame-markdown; + + # Depends on broken "Elm" package. + hakyll-elm = dontDistribute super.hakyll-elm; + haskelm = dontDistribute super.haskelm; + snap-elm = dontDistribute super.snap-elm; + + # Depends on broken "hails" package. + hails-bin = dontDistribute super.hails-bin; # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; From a855082f31ba262e36521807189d24ab3e34c541 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Dec 2015 13:19:44 +0100 Subject: [PATCH 156/498] haskell-morte has been fixed upstream. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b216764ff31..fd6d521369f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -938,9 +938,6 @@ self: super: { librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; }); - # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32 - morte = super.morte.override { alex = self.alex_3_1_4; }; - # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; } From 9d150d5968e01c14cbde9a56019a6480be0af240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 9 Dec 2015 16:36:10 +0100 Subject: [PATCH 157/498] pythonPackages.kombu: 3.0.29 -> 3.0.30 --- 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 61121bae2ca..a9d9e0e08f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9011,13 +9011,13 @@ in modules // { kombu = buildPythonPackage rec { name = "kombu-${version}"; - version = "3.0.29"; + version = "3.0.30"; disabled = pythonOlder "2.6"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz"; - sha256 = "1a6wlr2bv6j2z07wrxc5g0w6h99n2ciamx3f7qy40s76cpn5a2lp"; + sha256 = "0npq81ajiqmp8gjm7mq05n18y98xqpv7n4bbqb3p74d4irvgw0mr"; }; buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ]; From 781b9eab6163bba203dd536c965bc0b153522d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 9 Dec 2015 17:00:33 +0100 Subject: [PATCH 158/498] allow{reason}: a bit more explicit error message --- pkgs/stdenv/generic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 8e6bf2be63f..2fb1f8b39ae 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -126,10 +126,11 @@ let throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate." + (lib.strings.optionalString (reason != "blacklisted") '' - For `nixos-rebuild` you can set + a) For `nixos-rebuild` you can set { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. - For `nix-env` you can add + + b) For `nix-env`, `nix-build` or any other Nix command you can add { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); From 099712f78dad5bbd2bc7279cf0cfe67f2a25803b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Wed, 9 Dec 2015 15:50:18 +0100 Subject: [PATCH 159/498] nixos-manual: fix incomplete container doc --- .../manual/administration/declarative-containers.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 228c45b0c1f..253be80b9c4 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -22,8 +22,10 @@ containers.database = If you run nixos-rebuild switch, the container will -be built and started. If the container was already running, it will be -updated in place, without rebooting. +be built. If the container was already running, it will be +updated in place, without rebooting. Container can be configured to +start automatically by setting autoStart = true +in its configuration. By default, declarative containers share the network namespace of the host, meaning that they can listen on (privileged) @@ -41,13 +43,15 @@ containers.database = This gives the container a private virtual Ethernet interface with IP address 192.168.100.11, which is hooked up to a virtual Ethernet interface on the host with IP address -192.168.100.10. (See the next section for details +192.168.100.10. (See the next section for details on container networking.) To disable the container, just remove it from configuration.nix and run nixos-rebuild switch. Note that this will not delete the root directory of -the container in /var/lib/containers. +the container in /var/lib/containers. Containers can be +destroyed using the imperative method: nixos-container destroy + foo. Declarative containers can be started and stopped using the corresponding systemd service, e.g. systemctl start From 0956820a55fda5d784ef5be33bae5de863cadfbc Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Wed, 9 Dec 2015 14:33:16 +0100 Subject: [PATCH 160/498] font-droid: init at 2015-12-09 --- pkgs/data/fonts/droid/default.nix | 59 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/data/fonts/droid/default.nix diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix new file mode 100644 index 00000000000..0b5c00b877c --- /dev/null +++ b/pkgs/data/fonts/droid/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "font-droid-${version}"; + version = "2015-12-09"; + + srcs = [ + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidsans/DroidSans.ttf"; + sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidsans/DroidSans-Bold.ttf"; + sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidsansmono/DroidSansMono.ttf"; + sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif.ttf"; + sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-Bold.ttf"; + sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-Italic.ttf"; + sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-BoldItalic.ttf"; + sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi"; + }) + ]; + + phases = [ "unpackPhase" "installPhase" ]; + + sourceRoot = "./"; + + unpackCmd = '' + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + cp $curSrc ./$ttfName + ''; + + installPhase = '' + mkdir -p $out/share/fonts/droid + cp *.ttf $out/share/fonts/droid + ''; + + meta = { + description = "Droid Family fonts by Google Android"; + homepage = [ https://github.com/google/fonts ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648d2963976..34cb6b38296 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10751,6 +10751,8 @@ let freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; + font-droid = callPackage ../data/fonts/droid { }; + freepats = callPackage ../data/misc/freepats { }; gentium = callPackage ../data/fonts/gentium {}; From 67c109efe57012d41ad673e48f040be6a8e9977f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 9 Dec 2015 21:02:54 +0300 Subject: [PATCH 161/498] bumblebee: use postPatch instead of patchPhase --- pkgs/tools/X11/bumblebee/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d1f0ce93ab4..2206905aa3e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { # the have() function is deprecated and not available to bash completions the # way they are currently loaded in NixOS, so use _have. See #10936 - patchPhase = '' + postPatch = '' substituteInPlace scripts/bash_completion/bumblebee \ --replace "have optirun" "_have optirun" ''; From fe8192536f2be1f974416c9ad2fa3d199b08f3fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 4 Oct 2015 11:22:06 +0000 Subject: [PATCH 162/498] idea.phpstorm: 9.0 -> 10.0.1 --- pkgs/applications/editors/idea/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index fdf54ea662c..5cce2416abe 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -297,13 +297,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "9.0"; - build = "PS-141.1912"; + version = "10.0.1"; + build = "PS-143.382"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1n6p8xiv0nrs6yf0250mpga291msnrfamv573dva9f17cc3df2pp"; + sha256 = "12bqil8pxzmbv8a7pxn2529ph2x7szr3wvkvgxaisydm463kpdk8"; }; }; @@ -311,7 +311,7 @@ in name = "webstorm-${version}"; version = "10.0.4"; build = "141.1550"; - description = "Professional IDE for Web and JavaScript devlopment"; + description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; From 6baa6330647f2eec63d8d237f84a461c44cbc820 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 9 Dec 2015 15:57:53 +0100 Subject: [PATCH 163/498] rustcMaster: 2015-11-01 -> 2015-12-09 --- pkgs/development/compilers/rustc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index dc1bda27d97..ac232348328 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,11 +2,11 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-11-01"; + shortVersion = "2015-12-09"; isRelease = false; forceBundledLLVM = true; - srcRev = "1a2eaffb6"; - srcSha = "17b8zgz8j5dmz489b4zs2q4igc9x2v4isgqg3i5nzhacghxjqfyy"; + srcRev = "462ec0576"; + srcSha = "1mci0hxwnqb24j4k68rgffqk8ccznz2iddfmyhi8wxa094hqgghp"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. From b8495e4a0485cc9421d8a19dd6a32c0dfdb55bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Wed, 9 Dec 2015 21:01:47 +0100 Subject: [PATCH 164/498] nixos-manual: develop autoStart option for containers --- nixos/doc/manual/administration/declarative-containers.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 253be80b9c4..dccc8b0cb0d 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -24,7 +24,7 @@ containers.database = If you run nixos-rebuild switch, the container will be built. If the container was already running, it will be updated in place, without rebooting. Container can be configured to -start automatically by setting autoStart = true +start automatically by setting containers.database.autoStart = true in its configuration. By default, declarative containers share the network namespace From a5a481e7ee6af1c52d72f6cda48f7db3969e50d1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 9 Dec 2015 23:28:31 +0300 Subject: [PATCH 165/498] playonlinux: fix with new wxPython, fix OpenGL check --- .../applications/misc/playonlinux/default.nix | 106 ++++++++---------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 49 insertions(+), 61 deletions(-) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index b39eeac6878..65a703d8c89 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -1,8 +1,6 @@ { stdenv , makeWrapper , fetchurl -, wxPython -, libXmu , cabextract , gettext , glxinfo @@ -11,18 +9,46 @@ , imagemagick , netcat , p7zip -, python +, python2Packages , unzip , wget , wine , xdg-user-dirs , xterm +, pkgs +, pkgsi686Linux }: -stdenv.mkDerivation rec { - name = "playonlinux-${version}"; +let version = "4.2.9"; + binpath = stdenv.lib.makeSearchPath "bin" + [ cabextract + python2Packages.python + gettext + glxinfo + gnupg1compat + icoutils + imagemagick + netcat + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + ]; + + ld32 = + if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" + else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" + else abort "Unsupported platform for PlayOnLinux"; + ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; + libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; + +in stdenv.mkDerivation { + name = "playonlinux-${version}"; + src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624"; @@ -31,74 +57,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = - [ wxPython - libXmu - cabextract - gettext - glxinfo - gnupg1compat - icoutils - imagemagick - netcat - p7zip - python - unzip - wget - wine - xdg-user-dirs - xterm + [ python2Packages.python + python2Packages.wxPython + python2Packages.setuptools ]; patchPhase = '' - PYFILES="python/*.py python/lib/*.py tests/python/*.py" - sed -i "s/env python[0-9.]*/python/" $PYFILES + patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; installPhase = '' install -d $out/share/playonlinux - install -d $out/bin cp -r . $out/share/playonlinux/ - echo "#!${stdenv.shell}" > $out/bin/playonlinux - echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux - chmod +x $out/bin/playonlinux - install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop - ''; - preFixupPhases = [ "preFixupPhase" ]; + makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ + --prefix PATH : ${binpath} - preFixupPhase = '' - for f in $out/bin/*; do - wrapProgram $f \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ - --prefix PATH : \ - ${cabextract}/bin:\ - ${gettext}/bin:\ - ${glxinfo}/bin:\ - ${gnupg1compat}/bin:\ - ${icoutils}/bin:\ - ${imagemagick}/bin:\ - ${netcat}/bin:\ - ${p7zip}/bin:\ - ${python}/bin:\ - ${unzip}/bin:\ - ${wget}/bin:\ - ${wine}/bin:\ - ${xdg-user-dirs}/bin:\ - ${xterm}/bin - - done - - for f in $out/share/playonlinux/bin/*; do - bunzip2 $f - done - ''; - - postFixupPhases = [ "postFixupPhase" ]; - - postFixupPhase = '' + bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 + patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${libs pkgsi686Linux} $out/share/playonlinux/bin/check_dd_x86 + ${if stdenv.system == "x86_64-linux" then '' + bunzip2 $out/share/playonlinux/bin/check_dd_amd64.bz2 + patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${libs pkgs} $out/share/playonlinux/bin/check_dd_amd64 + '' else '' + rm $out/share/playonlinux/bin/check_dd_amd64.bz2 + ''} for f in $out/share/playonlinux/bin/*; do bzip2 $f done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45dd118b2a6..8edfdd17d38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12560,7 +12560,9 @@ let inherit (ocamlPackages) findlib cryptokit yojson; }; - playonlinux = callPackage ../applications/misc/playonlinux { }; + playonlinux = callPackage ../applications/misc/playonlinux { + stdenv = stdenv_32bit; + }; shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; From f4748d976e9a9b3dbcc451ebc1692b2e9156070f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 9 Dec 2015 08:50:22 +0100 Subject: [PATCH 166/498] eid-mw 4.1.8 -> 4.1.9 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5e06d2f32e2..c50dad11811 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite , pkgconfig }: -let version = "4.1.8"; in +let version = "4.1.9"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "1nmw4c2gvbpkrgjxyd2g0lbh85lb2czbgqplqrv69fr6azaddyyk"; + sha256 = "03hf3bkawhr4kpjcv71xhja3d947qvxmjf0lkyjmv7i3fw3j8jqs"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 8c81b79875283246bca5f99fa977602b92d6edd8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 9 Dec 2015 09:15:12 +0100 Subject: [PATCH 167/498] eid-mw: force-enable dialogues --- pkgs/tools/security/eid-mw/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index c50dad11811..c1590b92cbc 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac ''; + configureFlags = [ "--enable-dialogs=yes" ]; + enableParallelBuilding = true; doCheck = true; From e5fca5832bb2ecaf6f2c92147ef60170646ddd9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 9 Dec 2015 09:21:33 +0100 Subject: [PATCH 168/498] eid-mw: use GTK 3 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index c1590b92cbc..7823a9e0307 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite , pkgconfig }: let version = "4.1.9"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fedict"; }; - buildInputs = [ gtk2 pcsclite ]; + buildInputs = [ gtk3 pcsclite ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; postPatch = '' From eae3d7467b745ad9f0c07eddea25919ebd947ffa Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Wed, 9 Dec 2015 21:28:14 +0100 Subject: [PATCH 169/498] colordiff: 1.0.15 -> 1.0.16 --- pkgs/tools/text/colordiff/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 89bbd862dad..9b041ae4b2b 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl /*, xmlto */}: -stdenv.mkDerivation { - name = "colordiff-1.0.15"; +stdenv.mkDerivation rec { + name = "colordiff-1.0.16"; src = fetchurl { - url = http://www.colordiff.org/colordiff-1.0.15.tar.gz; - sha256 = "0icx4v2h1gy08vhh3qqi2qfyfjp37vgj27hq1fnjz83bg7ly8pjr"; + url = "http://www.colordiff.org/${name}.tar.gz"; + sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"; }; buildInputs = [ perl /* xmlto */ ]; From 2d586b99ccdb1466c2c5824deaf38fc29f8dbbdf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 16:19:37 -0600 Subject: [PATCH 170/498] plasma55.kscreen: propagate libkscreen dependency libkscreen provides a D-Bus service --- pkgs/desktops/plasma-5.5/kscreen.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix index 64fcab343e4..113c2565d07 100644 --- a/pkgs/desktops/plasma-5.5/kscreen.nix +++ b/pkgs/desktops/plasma-5.5/kscreen.nix @@ -10,9 +10,21 @@ plasmaPackage { makeQtWrapper ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui + kconfig + kconfigwidgets + kdbusaddons + kwidgetsaddons + kxmlgui + ]; + propagatedBuildInputs = [ + kglobalaccel + ki18n + libkscreen + qtdeclarative + ]; + propagatedUserEnvPkgs = [ + libkscreen # D-Bus service ]; - propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; From 1a7d7c1c2885fd9952bb21dbeac839161f9cd27f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 16:20:02 -0600 Subject: [PATCH 171/498] plasma55.plasma-workspace: update patches --- .../plasma-workspace/0001-qt-5.5-QML-import-paths.patch | 4 ++-- .../plasma-workspace/0002-startkde-NixOS-patches.patch | 8 ++++---- pkgs/desktops/plasma-5.5/plasma-workspace/default.nix | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch index 251e1260e66..fd0d596243b 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch @@ -1,4 +1,4 @@ -From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001 +From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:55:36 -0500 Subject: [PATCH 1/2] qt-5.5 QML import paths @@ -80,7 +80,7 @@ index a086581..6e1e8be 100755 Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index d32e7b7..828c5fb 100644 +index 80e7e53..0083cf0 100644 --- a/applets/lock_logout/contents/ui/lockout.qml +++ b/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch index d8f3e669bc7..4b458580633 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch @@ -1,6 +1,6 @@ -From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001 +From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 22 Nov 2015 08:31:42 -0600 +Date: Wed, 9 Dec 2015 13:20:02 -0600 Subject: [PATCH 2/2] startkde NixOS patches --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] startkde NixOS patches 1 file changed, 89 insertions(+), 122 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 41a8975..130578e 100644 +index 37ab5cd..130578e 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -121,7 +121,7 @@ index 41a8975..130578e 100644 - } - - oxygenDir=$fontsDir/oxygen -- prefixDir="@@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" - - # if the oxygen dir doesn't exist, create a symlink to be sure that the - # Oxygen font is available to the user diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix index bf8b0304a41..78db6e51511 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix @@ -49,7 +49,6 @@ plasmaPackage rec { wrapQtProgram "$out/bin/kcheckrunning" wrapQtProgram "$out/bin/systemmonitor" wrapQtProgram "$out/bin/kstartupconfig5" - wrapQtProgram "$out/bin/startplasmacompositor" wrapQtProgram "$out/bin/kdostartupconfig5" wrapQtProgram "$out/bin/klipper" wrapQtProgram "$out/bin/kuiserver5" @@ -57,6 +56,9 @@ plasmaPackage rec { wrapQtProgram "$out/bin/plasmashell" wrapQtProgram "$out/lib/libexec/drkonqi" + + rm "$out/bin/startplasmacompositor" rm "$out/lib/libexec/startplasma" + rm -r "$out/share/wayland-sessions" ''; } From 535faa3c320fdcdaef503fd6a2852616eca457f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 16:20:10 -0600 Subject: [PATCH 172/498] plasma55.plasma-desktop: reformat --- .../plasma-5.5/plasma-desktop/default.nix | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix index 843a7c03c43..a73060ad1af 100644 --- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix @@ -18,16 +18,46 @@ plasmaPackage rec { makeQtWrapper ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon - qtsvg xf86inputevdev xf86inputsynaptics - xkeyboard_config xinput + attica + boost + fontconfig + kcmutils + kdbusaddons + kded + kitemmodels + knewstuff + knotifications + knotifyconfig + kwallet + libcanberra_kde + libXcursor + libpulseaudio + libXft + libxkbfile + phonon + qtsvg + xf86inputevdev + xf86inputsynaptics + xkeyboard_config + xinput ]; propagatedBuildInputs = [ - baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtquick1 qtquickcontrols + baloo + kactivities + kauth + kdeclarative + kdelibs4support + kemoticons + kglobalaccel + ki18n + kpeople + krunner + kwin + plasma-framework + plasma-workspace + qtdeclarative + qtquick1 + qtquickcontrols qtx11extras ]; # All propagatedBuildInputs should be present in the profile because From aab20cdc510dc2cf109061992acd02bd19415f7d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 16:24:17 -0600 Subject: [PATCH 173/498] rubber: 1.1 -> 1.3 * version upgrade * minor formatting change * assign ttuegel as maintainer --- pkgs/tools/typesetting/rubber/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 7c58c480a79..101f43e86ce 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,22 +1,21 @@ { fetchurl, stdenv, python, texinfo }: stdenv.mkDerivation rec { - name = "rubber-1.1"; + name = "rubber-1.3"; src = fetchurl { - url = "http://ebeffara.free.fr/pub/${name}.tar.gz"; - sha256 = "1xbkv8ll889933gyi2a5hj7hhh216k04gn8fwz5lfv5iz8s34gbq"; + url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz"; + sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh"; }; buildInputs = [ python texinfo ]; - patchPhase = "substituteInPlace configure --replace which \"type -P\""; - - postInstall = "rm $out/share/rubber/modules/etex.rub"; + patchPhase = '' + substituteInPlace configure --replace which "type -P" + ''; meta = { description = "Wrapper for LaTeX and friends"; - longDescription = '' Rubber is a program whose purpose is to handle all tasks related to the compilation of LaTeX documents. This includes compiling @@ -26,9 +25,8 @@ stdenv.mkDerivation rec { produce PostScript documents is also included, as well as usage of pdfLaTeX to produce PDF documents. ''; - license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } From 3856e6939fc683c2568afb1889311e97728022a8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 16:27:49 -0600 Subject: [PATCH 174/498] rubber: wrap Python programs --- pkgs/tools/typesetting/rubber/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 101f43e86ce..96e1f532bff 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, texinfo }: +{ fetchurl, stdenv, python, pythonPackages, texinfo }: stdenv.mkDerivation rec { name = "rubber-1.3"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ python texinfo ]; + nativeBuildInputs = [ pythonPackages.wrapPython ]; patchPhase = '' substituteInPlace configure --replace which "type -P" ''; + postInstall = "wrapPythonPrograms"; + meta = { description = "Wrapper for LaTeX and friends"; longDescription = '' From 98bd11125f0513e2c04ddf6a8faa06f2b6673fea Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2015 17:18:05 -0600 Subject: [PATCH 175/498] plasma54.kscreen: propagate libkscreen dependency libkscreen provides a D-Bus service. --- pkgs/desktops/plasma-5.4/kscreen.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index 64fcab343e4..dac7a6ba20a 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -13,6 +13,9 @@ plasmaPackage { kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; + propagatedUserEnvPkgs = [ + libkscreen # D-Bus service + ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; From 2ce24737c8b4772beb7f904efd886d295b8ead23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Dec 2015 02:37:41 +0100 Subject: [PATCH 176/498] redshift: depend on geoclue2 directly --- pkgs/applications/misc/redshift/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6e5404eb686..ad2f5f74cce 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue +, geoclue2 , guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb @@ -17,7 +17,7 @@ stdenv.mkDerivation { url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; - buildInputs = [ geoclue ] + buildInputs = [ geoclue2 ] ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8edfdd17d38..ffc69199f33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14655,7 +14655,6 @@ let redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg; - geoclue = geoclue2; }; orion = callPackage ../misc/themes/orion {}; From 120f8eef67ad725aebdbf439bc90e873a106585e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Dec 2015 03:37:38 +0100 Subject: [PATCH 177/498] simple-scan: makeWrapper -> wrapGAppsHook --- pkgs/applications/graphics/simple-scan/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 1943d24382a..4b42e27d063 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb -, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }: +, libxml2, pkgconfig, saneBackends, systemd, vala, wrapGAppsHook }: let version = "3.19.2"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends systemd vala ]; - nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ]; + nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-packagekit" ]; @@ -25,11 +25,6 @@ stdenv.mkDerivation rec { doCheck = true; - preFixup = '' - wrapProgram "$out/bin/simple-scan" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { inherit version; description = "Simple scanning utility"; From 34e1b71c622e259b03205f4b3da2c54056161363 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Dec 2015 03:42:48 +0100 Subject: [PATCH 178/498] simple-scan: drop obsolete systemd dependency --- pkgs/applications/graphics/simple-scan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 4b42e27d063..4dd30697f0b 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb -, libxml2, pkgconfig, saneBackends, systemd, vala, wrapGAppsHook }: +{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool +, libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: let version = "3.19.2"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends - systemd vala ]; + vala ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-packagekit" ]; From 90912a89d9a06837bd90540b6f2dcc4c5bb5b883 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 10 Dec 2015 05:45:24 +0100 Subject: [PATCH 179/498] font-droid: fix srcs urls pin urls to a specific commitish, because in the case the font gets an update hashes will change on the master and therefore break, as @zimbatm pointed out in #11574. --- pkgs/data/fonts/droid/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 0b5c00b877c..784dfe71007 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -3,34 +3,35 @@ stdenv.mkDerivation rec { name = "font-droid-${version}"; version = "2015-12-09"; + at = "2776afefa9e0829076cd15fdc41e7950e2ffab82"; srcs = [ (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidsans/DroidSans.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf"; sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidsans/DroidSans-Bold.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf"; sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidsansmono/DroidSansMono.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf"; sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf"; sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-Bold.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf"; sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-Italic.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf"; sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0"; }) (fetchurl { - url = "https://github.com/google/fonts/raw/master/apache/droidserif/DroidSerif-BoldItalic.ttf"; + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf"; sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi"; }) ]; From 272e32492f0db1c17f7a2faa2e1a0d60d6f33894 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 9 Dec 2015 17:04:26 +0000 Subject: [PATCH 180/498] python3Packages.basemap: enabled This package was marked incompatible with python3 by mistake. --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9d9e0e08f1..9cc454a516c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21593,7 +21593,6 @@ in modules // { basemap = buildPythonPackage rec { name = "basemap-1.0.7"; - disabled = ! isPy27; src = pkgs.fetchurl { url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; From 76940c5e4cf73bd822e1879e8ac66b9f891813e4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Dec 2015 10:37:44 +0100 Subject: [PATCH 181/498] ocaml-why3: init at 0.86.2 --- .../ocaml-modules/why3/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/why3/default.nix diff --git a/pkgs/development/ocaml-modules/why3/default.nix b/pkgs/development/ocaml-modules/why3/default.nix new file mode 100644 index 00000000000..3ce0f8bdfac --- /dev/null +++ b/pkgs/development/ocaml-modules/why3/default.nix @@ -0,0 +1,21 @@ +{ stdenv, ocaml, findlib, zarith, menhir, why3 }: + +let ocaml-version = stdenv.lib.getVersion ocaml; in + +assert stdenv.lib.versionAtLeast ocaml-version "4.01"; + +stdenv.mkDerivation { + name = "ocaml-${why3.name}"; + + inherit (why3) src; + + buildInputs = [ ocaml findlib zarith menhir ]; + + installTargets = "install-lib"; + + meta = { + inherit (why3.meta) license homepage; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffc69199f33..a3e0b9ab8e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4740,6 +4740,10 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + why3 = callPackage ../development/ocaml-modules/why3 { + why3 = pkgs.why3; + }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; From 984d1de1cc7a5cd4c21e583236433cafc8df5df3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 11:38:18 +0100 Subject: [PATCH 182/498] python wheel: init at 0.26.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9247fc4404..72ee9e16dde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19151,7 +19151,25 @@ in modules // { }; }; + wheel = buildPythonPackage rec { + name = "wheel-${version}"; + version = "0.26.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz"; + sha256 = "eaad353805c180a47545a256e6508835b65a8e830ba1093ed8162f19a50a530c"; + }; + + buildInputs = with self; [ pytest pytestcov coverage ]; + + propagatedBuildInputs = with self; [ jsonschema ]; + + meta = { + description = "A built-package format for Python"; + license = with licenses; [ mit ]; + homepage = https://bitbucket.org/pypa/wheel/; + }; + }; willie = buildPythonPackage rec { name = "willie-5.2.0"; From 66c90e6e1f22b2712f0714914504dee5e751a334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 10 Dec 2015 12:40:38 +0100 Subject: [PATCH 183/498] add makeBinPath function for abstracting away pkg/bin:pkg2/bin.. --- lib/strings.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/strings.nix b/lib/strings.nix index bf6cbd2cbfa..ce2c4132bbc 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -52,6 +52,10 @@ rec { # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...". makeLibraryPath = makeSearchPath "lib"; + # Construct a binary search path (such as $PATH) containing the + # binaries for a set of packages, e.g. "${pkg1}/bin:${pkg2}/bin:...". + makeBinPath = makeSearchPath "bin"; + # Idem for Perl search paths. makePerlPath = makeSearchPath "lib/perl5/site_perl"; From c879a6eed5c802bfb9b07c829a7dbc86605bce5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 10 Dec 2015 12:47:24 +0100 Subject: [PATCH 184/498] snabbswitch: add missing dependencies --- pkgs/tools/networking/snabbswitch/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabbswitch/default.nix index 40800c5f42c..7c4563e5397 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabbswitch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb }: stdenv.mkDerivation rec { name = "snabb-${version}"; @@ -9,9 +9,22 @@ stdenv.mkDerivation rec { sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; }; + buildInputs = [ makeWrapper ]; + + patchPhase = '' + patchShebangs . + + # some hardcodeism + for f in $(find src/program/snabbnfv/ -type f); do + substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" + done + ''; + installPhase = '' mkdir -p $out/bin cp src/snabb $out/bin + + wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb ]}" ''; meta = with stdenv.lib; { @@ -27,7 +40,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego ]; + maintainers = [ maintainers.lukego maintainers.iElectric ]; }; } From 2de76b275366a700f7f79709bf30d67358f2838a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Dec 2015 12:16:50 +0100 Subject: [PATCH 185/498] nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932 --- pkgs/tools/package-management/nix/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1d8c5d86b23..7f134c18844 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -13,8 +13,8 @@ let nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl sqlite ] ++ - lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; + buildInputs = [ curl openssl sqlite xz ] + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; propagatedBuildInputs = [ boehmgc ]; @@ -97,10 +97,10 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4273_71039be"; + name = "nix-1.11pre4334_7431932"; src = fetchurl { - url = "http://hydra.nixos.org/build/27061065/download/4/${name}.tar.xz"; - sha256 = "4a1bc541868c317708fc8b532e22f5ead8d9759eee6a2680719584841cf897af"; + url = "http://hydra.nixos.org/build/28747184/download/4/${name}.tar.xz"; + sha256 = "ccb0c5be03b9af1bf89e79758868b0cd62c79fd7a0f0791cdb99df86e4240fc4"; }; }); From 05c12a337db7f50e28ba4f1e8428176648290b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 10 Dec 2015 15:37:59 +0100 Subject: [PATCH 186/498] snabbswitch: add missing diffutils dependency --- pkgs/tools/networking/snabbswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabbswitch/default.nix index 7c4563e5397..f7cd1a4300a 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb }: +{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }: stdenv.mkDerivation rec { name = "snabb-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp src/snabb $out/bin - wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb ]}" + wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}" ''; meta = with stdenv.lib; { From e115e3fd761ac9b087f7d609a870f08165b8edc5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Dec 2015 20:35:25 +0100 Subject: [PATCH 187/498] Manual: Rename file --- doc/{packageconfig.xml => configuration.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{packageconfig.xml => configuration.xml} (100%) diff --git a/doc/packageconfig.xml b/doc/configuration.xml similarity index 100% rename from doc/packageconfig.xml rename to doc/configuration.xml From 6bd0519918df90d5c9449f5ca7d70eb09424ee31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Dec 2015 20:41:18 +0100 Subject: [PATCH 188/498] Manual: Fix indent of config section --- doc/configuration.xml | 145 ++++++++++++++++++++++----------------- doc/language-support.xml | 1 - 2 files changed, 83 insertions(+), 63 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index 4e0fcc3b6a4..ce25bbfce77 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -1,88 +1,109 @@ + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="chap-packageconfig"> <filename>~/.nixpkgs/config.nix</filename>: global configuration - - Nix packages can be configured to allow or deny certain options. - +Nix packages can be configured to allow or deny certain options. - - To apply the configuration edit ~/.nixpkgs/config.nix - and set it like -{ +To apply the configuration edit +~/.nixpkgs/config.nix and set it like + + +{ allowUnfree = true; -} - and will allow the Nix package manager to install unfree licensed packages. +} + + +and will allow the Nix package manager to install unfree licensed packages. + +The configuration as listed also applies to NixOS under + set. + + + + + Allow installing of packages that are distributed under + unfree license by setting allowUnfree = + true; or deny them by setting it to + false. + + Same can be achieved by setting the environment variable: + + +$ export NIXPKGS_ALLOW_UNFREE=1 + - The configuration as listed also applies to NixOS under set. + - - - - Allow installing of packages that are distributed under unfree license by setting - allowUnfree = true; - or deny them by setting it to false. - - - Same can be achieved by setting the environment variable: - $ export NIXPKGS_ALLOW_UNFREE=1 - - + + Whenever unfree packages are not allowed, single packages + can still be allowed by a predicate function that accepts package + as an argument and should return a boolean: - - - Whenever unfree packages are not allowed, single packages can - still be allowed by a predicate function that accepts package - as an argument and should return a boolean: - allowUnfreePredicate = (pkg: ...); + +allowUnfreePredicate = (pkg: ...); + - Example to allow flash player only: - allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name); - - + Example to allow flash player only: - - - Whenever unfree packages are not allowed, packages can still be - whitelisted by their license: - whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; - - + +allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name); + - - - In addition to whitelisting licenses which are denied by the - allowUnfree setting, you can also explicitely - deny installation of packages which have a certain license: - blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; - - - - - - A complete list of licenses can be found in the file - lib/licenses.nix of the nix package tree. + + + + Whenever unfree packages are not allowed, packages can still + be whitelisted by their license: + + +whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; + + + + + + In addition to whitelisting licenses which are denied by the + allowUnfree setting, you can also explicitely + deny installation of packages which have a certain license: + + +blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; + + + + + + +A complete list of licenses can be found in the file +lib/licenses.nix of the nix package tree. + + +
Modify packages via <literal>packageOverrides</literal> - +You can define a function called +packageOverrides in your local +~/.nixpkgs/config to overide nix packages. It +must be a function that takes pkgs as an argument and return modified +set of packages. - You can define a function called packageOverrides - in your local ~/.nixpkgs/config to overide nix - packages. It must be a function that takes pkgs as an argument and - return modified set of packages. - - { + +{ packageOverrides = pkgs: rec { foo = pkgs.foo.override { ... }; }; -} +} + + +
+ diff --git a/doc/language-support.xml b/doc/language-support.xml index 9a88ea4fa6f..f0d5dbd3e64 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -1,4 +1,3 @@ - From bb672805cddbd3b5b145a1b5188444ba9af6cde5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Dec 2015 15:18:30 +0100 Subject: [PATCH 189/498] fetchurl: Always use tarballs.nixos.org Otherwise, if the upstream mirror changes (rather than deletes) a file, then tarballs.nixos.org won't be used even if it has a copy of the original file, and so we'll get a hash mismatch. --- pkgs/build-support/fetchurl/builder.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index b4c8e1f992c..29565d7cdb9 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -89,10 +89,6 @@ for url in $urls; do if test -z "${!varName}"; then echo "warning: unknown mirror:// site \`$site'" else - # Assume that SourceForge/GNU/kernel mirrors have better - # bandwidth than nixos.org. - preferHashedMirrors= - mirrors=${!varName} # Allow command-line override by setting NIX_MIRRORS_$site. From 567e002545cfb84d2d41cd4495684bc01c755170 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Dec 2015 15:53:48 +0100 Subject: [PATCH 190/498] copy-tarballs: Use an S3 bucket for tarballs.nixos.org Tarballs.nixos.org is now stored in an S3 bucket rather than an EBS volume. Redirects are used to simulate symlinks. The function find-tarballs.nix now filters out fetchzip, fetchpatch and the like. --- maintainers/scripts/copy-tarballs.pl | 221 ++++++++++++++++---------- maintainers/scripts/find-tarballs.nix | 9 +- 2 files changed, 141 insertions(+), 89 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index c6d77529dd4..486ee8a4444 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,97 +1,144 @@ -#! /run/current-system/sw/bin/perl -w +#! /usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 nixUnstable + +# This command uploads tarballs to tarballs.nixos.org, the +# content-addressed cache used by fetchurl as a fallback for when +# upstream tarballs disappear or change. Usage: +# +# 1) To upload a single file: +# +# $ copy-tarballs.pl --file /path/to/tarball.tar.gz +# +# 2) To upload all files obtained via calls to fetchurl in a Nix derivation: +# +# $ copy-tarballs.pl --expr '(import {}).hello' use strict; -use XML::Simple; +use warnings; use File::Basename; use File::Path; -use File::Copy 'cp'; -use IPC::Open2; +use JSON; +use Net::Amazon::S3; use Nix::Store; -my $myDir = dirname($0); +# S3 setup. +my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die; +my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die; -my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs"; +my $s3 = Net::Amazon::S3->new( + { aws_access_key_id => $aws_access_key_id, + aws_secret_access_key => $aws_secret_access_key, + retry => 1, + }); -my $xml = `nix-instantiate --eval-only --xml --strict ''`; -die "$0: evaluation failed\n" if $? != 0; +my $bucket = $s3->bucket("nixpkgs-tarballs") or die; -my $data = XMLin($xml) or die; - -mkpath($tarballsCache); -mkpath("$tarballsCache/md5"); -mkpath("$tarballsCache/sha1"); -mkpath("$tarballsCache/sha256"); - -foreach my $file (@{$data->{list}->{attrs}}) { - my $url = $file->{attr}->{url}->{string}->{value}; - my $algo = $file->{attr}->{type}->{string}->{value}; - my $hash = $file->{attr}->{hash}->{string}->{value}; - - if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { - print STDERR "skipping $url (unsupported scheme)\n"; - next; - } - - $url =~ /([^\/]+)$/; - my $fn = $1; - - if (!defined $fn) { - print STDERR "skipping $url (no file name)\n"; - next; - } - - if ($fn =~ /[&?=%]/ || $fn =~ /^\./) { - print STDERR "skipping $url (bad character in file name)\n"; - next; - } - - if ($fn !~ /[a-zA-Z]/) { - print STDERR "skipping $url (no letter in file name)\n"; - next; - } - - if ($fn !~ /[0-9]/) { - print STDERR "skipping $url (no digit in file name)\n"; - next; - } - - if ($fn !~ /[-_\.]/) { - print STDERR "skipping $url (no dash/dot/underscore in file name)\n"; - next; - } - - my $dstPath = "$tarballsCache/$fn"; - - next if -e $dstPath; - - print "downloading $url to $dstPath...\n"; - - next if $ENV{DRY_RUN}; - - $ENV{QUIET} = 1; - $ENV{PRINT_PATH} = 1; - my $fh; - my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; - waitpid($pid, 0) or die; - if ($? != 0) { - print STDERR "failed to fetch $url: $?\n"; - next; - } - <$fh>; my $storePath = <$fh>; chomp $storePath; - - die unless -e $storePath; - - cp($storePath, $dstPath) or die; - - my $md5 = hashFile("md5", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/md5/$md5"); - - my $sha1 = hashFile("sha1", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha1/$sha1"); - - my $sha256 = hashFile("sha256", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha256/$sha256"); - - $sha256 = hashFile("sha256", 1, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha256/$sha256"); +sub alreadyMirrored { + my ($algo, $hash) = @_; + return defined $bucket->get_key("$algo/$hash"); +} + +sub uploadFile { + my ($fn, $name) = @_; + + my $md5_16 = hashFile("md5", 0, $fn) or die; + my $sha1_16 = hashFile("sha1", 0, $fn) or die; + my $sha256_32 = hashFile("sha256", 1, $fn) or die; + my $sha256_16 = hashFile("sha256", 0, $fn) or die; + my $sha512_32 = hashFile("sha512", 1, $fn) or die; + my $sha512_16 = hashFile("sha512", 0, $fn) or die; + + my $mainKey = "sha512/$sha512_16"; + + return if alreadyMirrored("sha512", $sha512_16); + + # Upload the file as sha512/. + print STDERR "uploading $fn to $mainKey...\n"; + $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) + or die "failed to upload $fn to $mainKey\n"; + + # Create redirects from the other hash types. + sub redirect { + my ($name, $dest) = @_; + #print STDERR "linking $name to $dest...\n"; + $bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest }) + or die "failed to create redirect from $name to $dest\n"; + } + redirect "md5/$md5_16", $mainKey; + redirect "sha1/$sha1_16", $mainKey; + redirect "sha256/$sha256_32", $mainKey; + redirect "sha256/$sha256_16", $mainKey; + redirect "sha512/$sha512_32", $mainKey; +} + +my $op = $ARGV[0] // ""; + +if ($op eq "--file") { + my $fn = $ARGV[1] // die "$0: --file requires a file name\n"; + if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { + print STDERR "$fn is already mirrored\n"; + } else { + uploadFile($fn, basename $fn); + } +} + +elsif ($op eq "--expr") { + + # Evaluate find-tarballs.nix. + my $expr = $ARGV[1] // die "$0: --expr requires a Nix expression\n"; + my $pid = open(JSON, "-|", "nix-instantiate", "--eval-only", "--json", "--strict", + "", + "--arg", "expr", $expr); + my $stdout = ; + waitpid($pid, 0); + die "$0: evaluation failed\n" if $?; + close JSON; + + my $fetches = decode_json($stdout); + + print STDERR "evaluation returned ", scalar(@{$fetches}), " tarballs\n"; + + # Check every fetchurl call discovered by find-tarballs.nix. + my $mirrored = 0; + my $have = 0; + foreach my $fetch (@{$fetches}) { + my $url = $fetch->{url}; + my $algo = $fetch->{type}; + my $hash = $fetch->{hash}; + + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { + print STDERR "skipping $url (unsupported scheme)\n"; + next; + } + + if (alreadyMirrored($algo, $hash)) { + $have++; + next; + } + + print STDERR "mirroring $url...\n"; + + next if $ENV{DRY_RUN}; + + # Download the file using nix-prefetch-url. + $ENV{QUIET} = 1; + $ENV{PRINT_PATH} = 1; + my $fh; + my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; + waitpid($pid, 0) or die; + if ($? != 0) { + print STDERR "failed to fetch $url: $?\n"; + next; + } + <$fh>; my $storePath = <$fh>; chomp $storePath; + + uploadFile($storePath, $url); + $mirrored++; + } + + print STDERR "mirrored $mirrored files, already have $have files\n"; +} + +else { + die "Syntax: $0 --file FILENAME | --expr EXPR\n"; } diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 5d0cb19aba4..2dd17d9df88 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -4,9 +4,11 @@ with import ../.. { }; with lib; +{ expr ? removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ] }: + let - root = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ]; + root = expr; uniqueUrls = map (x: x.file) (genericClosure { startSet = map (file: { key = file.url; inherit file; }) urls; @@ -15,7 +17,10 @@ let urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; - fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv ? urls) dependencies; + fetchurlDependencies = + filter + (drv: drv.outputHash or "" != "" && drv.outputHashMode == "flat" && drv.postFetch or "" == "" && drv ? urls) + dependencies; dependencies = map (x: x.value) (genericClosure { startSet = map keyDrv (derivationsIn' root); From 54d6f1f683a448e094f31b5732c424c2467eaf8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Dec 2015 16:26:33 +0100 Subject: [PATCH 191/498] linux: 3.14.56 -> 3.14.58 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index afb4437459b..987452618f0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.56"; + version = "3.14.58"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ggvjrz51nfhj7amn3v2nd0b0x8dnz68k9cldzl729cqp9gsc3hf"; + sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l"; }; features.iwlwifi = true; From b2c4f30df58b312087de156881ec7a35180b518d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 14:51:34 +0100 Subject: [PATCH 192/498] python py: 1.4.30 -> 1.4.31 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9d9e0e08f1..d30dbebdcf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13625,15 +13625,16 @@ in modules // { py = buildPythonPackage rec { - name = "py-1.4.30"; + name = "py-${version}"; + version = "1.4.31"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "a904aabfe4765cb754f2db84ec7bb03a"; + sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114"; }; # some weird errors with paths - doCheck = !isPy3k; + # doCheck = !isPy3k; meta = { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; From 9b33ec1764c34d5e9d542f59ce932209941b64f1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 10 Dec 2015 16:01:04 +0000 Subject: [PATCH 193/498] build-fhs-userenv: don't leak file descriptors This re-uses the capabilities documented in `Process.spawn` to avoid leaking unecessary file-descriptors to the sandbox --- pkgs/build-support/build-fhs-userenv/chroot-user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 05b4914b6f6..97316ac4369 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -140,10 +140,10 @@ if $cpid == 0 link_swdir.call swdir, Pathname.new('') # New environment - ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ]) + new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ] # Finally, exec! - exec *execp + exec(new_env, *execp, close_others: true, unsetenv_others: true) end # Wait for a child. If we catch a signal, resend it to child and continue From 1b05ef86f0c27ba42cb31cf793c1054fd594c31d Mon Sep 17 00:00:00 2001 From: wedens Date: Thu, 10 Dec 2015 22:06:12 +0600 Subject: [PATCH 194/498] rtv: 1.6.1 -> 1.7.0 --- pkgs/applications/misc/rtv/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index f67797fbe86..84f9bdcadb7 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "1.6.1"; + version = "1.7.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0ywx4h37b25w36vln2ydpw73ysbbkpibp597cghsfn2izlaa0i02"; + sha256 = "0fynymia3c2rynq9bm0jssd3rad7f7hhmjpkby7yj6g3jvk7jn4x"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e407be5969f..2a516013582 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13448,7 +13448,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/praw/${name}.zip"; - sha256 = "1dilb3vr5llqy344i6nh7gl07wcssb5dmqrhjwhfqi1mais7b953"; + sha256 = "17s8s4a1yk9rq21f3kmj9k4dbgvfa3650l8b39nhwybvxl3j5nfv"; }; propagatedBuildInputs = with self; [ From 171d622fcd1f28c87b2f47ed4c9e96a6d637b25f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 20 Sep 2015 21:38:40 +0000 Subject: [PATCH 195/498] redir: init at 2.2.1 --- pkgs/tools/networking/redir/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/networking/redir/default.nix diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix new file mode 100644 index 00000000000..1fcb73e00dc --- /dev/null +++ b/pkgs/tools/networking/redir/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "redir-2.2.1"; + + src = fetchurl { + url = "http://sammy.net/~sammy/hacks/${name}.tar.gz"; + sha256 = "0v0f14br00rrmd1ss644adsby4gm29sn7a2ccy7l93ik6pw099by"; + }; + + installPhase = '' + mkdir -p $out/bin + cp redir $out/bin + ''; + + meta = { + description = "A port redirector"; + homepage = http://sammy.net/~sammy/hacks/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ globin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648d2963976..8053318f6e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2855,6 +2855,8 @@ let read-edid = callPackage ../os-specific/linux/read-edid { }; + redir = callPackage ../tools/networking/redir { }; + redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; From 34e67f558f6e09f93b1093e514d546d8844626c5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 8 Dec 2015 10:51:15 +0000 Subject: [PATCH 196/498] rustfmt: 2015-10-28 -> 2015-12-08 --- pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 876734a3e11..49a87754e72 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -3,15 +3,15 @@ with rustPlatform; buildRustPackage rec { - name = "rustfmt-git-2015-10-28"; + name = "rustfmt-git-2015-12-08"; src = fetchFromGitHub { owner = "nrc"; repo = "rustfmt"; - rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76"; - sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd"; + rev = "e94bd34a06d878a41bb8be409f173a8824dda63f"; + sha256 = "0f0ixbr5nfla0j0b91plmapw75yl3d3lxwvllj2wx4z94nfxanp6"; }; - depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb"; + depsSha256 = "0vsrpw4icn9jf44sqr5749hbazsxp3hqn1g7gr90fvnfvz4s5f07"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From 8f5856ce632938a05a70ecec763e272f81164f48 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Dec 2015 17:25:54 +0100 Subject: [PATCH 197/498] copy-tarballs.pl: Remove redundant check --- maintainers/scripts/copy-tarballs.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 486ee8a4444..6be1300e513 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -50,8 +50,6 @@ sub uploadFile { my $mainKey = "sha512/$sha512_16"; - return if alreadyMirrored("sha512", $sha512_16); - # Upload the file as sha512/. print STDERR "uploading $fn to $mainKey...\n"; $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) From 80681dd60a41e78182370eff835f09f938d4e911 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 11:05:43 -0600 Subject: [PATCH 198/498] pinentry: 0.9.5 -> 0.9.6 --- pkgs/tools/security/pinentry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 30d717c7bc1..8ccf1ba7ccd 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -10,11 +10,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "pinentry-0.9.5"; + name = "pinentry-0.9.6"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1338hj1h3sh34897120y30x12b64wyj3xjzzk5asm2hdzhxgsmva"; + sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; }; buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; From 2b318da6191edf54ef85b27fa7795cf1d560cc96 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 11:06:00 -0600 Subject: [PATCH 199/498] pinentry_qt5: init at 0.9.6 --- pkgs/tools/security/pinentry/qt5.nix | 47 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/security/pinentry/qt5.nix diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix new file mode 100644 index 00000000000..d0811cdd11a --- /dev/null +++ b/pkgs/tools/security/pinentry/qt5.nix @@ -0,0 +1,47 @@ +{ fetchurl, stdenv, pkgconfig +, libgpgerror, libassuan +, qtbase +, libcap ? null +}: + +let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "pinentry-0.9.6"; + + src = fetchurl { + url = "mirror://gnupg/pinentry/${name}.tar.bz2"; + sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; + }; + + buildInputs = [ libgpgerror libassuan libcap qtbase ]; + + # configure cannot find moc on its own + preConfigure = '' + export QTDIR="${qtbase}" + export MOC="${qtbase}/bin/moc" + ''; + + configureFlags = [ + (mkWith (libcap != null) "libcap") + (mkEnable true "pinentry-qt") + ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + homepage = "http://gnupg.org/aegypten2/"; + description = "GnuPG's interface to passphrase input"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + longDescription = '' + Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + to enter a passphrase when `gpg' or `gpg2' is run and needs it. + ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8edfdd17d38..ab64ddabc82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2711,6 +2711,10 @@ let qt4 = null; }; + pinentry_qt5 = qt55Libs.callPackage ../tools/security/pinentry/qt5.nix { + libcap = if stdenv.isDarwin then null else libcap; + }; + pius = callPackage ../tools/security/pius { }; pk2cmd = callPackage ../tools/misc/pk2cmd { }; From 31d68a68b5432253938dc893d7bae522fa4c9cb5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 11:06:10 -0600 Subject: [PATCH 200/498] pinentry_ncurses: init at 0.9.6 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab64ddabc82..a2b9d5d07c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2711,6 +2711,10 @@ let qt4 = null; }; + pinentry_ncurses = pinentry.override { + gtk2 = null; + }; + pinentry_qt5 = qt55Libs.callPackage ../tools/security/pinentry/qt5.nix { libcap = if stdenv.isDarwin then null else libcap; }; From ca0514db49e277f85e0b9c3689f546d3a8a7cf62 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 11:06:18 -0600 Subject: [PATCH 201/498] pinentry_qt4: init at 0.9.6 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2b9d5d07c4..f3d99293fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2715,6 +2715,10 @@ let gtk2 = null; }; + pinentry_qt4 = pinentry_ncurses.override { + inherit qt4; + }; + pinentry_qt5 = qt55Libs.callPackage ../tools/security/pinentry/qt5.nix { libcap = if stdenv.isDarwin then null else libcap; }; From f8d2af6260be524fa0f1a020a331f260d40fa4aa Mon Sep 17 00:00:00 2001 From: wedens Date: Thu, 10 Dec 2015 23:51:07 +0600 Subject: [PATCH 202/498] goldendict: b4bb1e9 -> ec86516 --- pkgs/applications/misc/goldendict/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 32a16e79c21..9a7fad6a207 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { - name = "goldendict-1.5.0.20150801"; + name = "goldendict-1.5.0.ec86515"; src = fetchFromGitHub { owner = "goldendict"; repo = "goldendict"; - rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062"; - sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2"; + rev = "ec865158f5b7116f629e4d451a39ee59093eefa5"; + sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr"; }; buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; From 3f842516a176a8e39cbf3d1f9219a7f9e3c62dd6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 5 Jun 2015 16:51:45 +0200 Subject: [PATCH 203/498] nixos.transmission: fix apparmor profile --- .../modules/services/torrent/transmission.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1c914922404..b3f1f906636 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,21 +113,26 @@ in #include #include - ${pkgs.glibc}/lib/*.so mr, - ${pkgs.libevent}/lib/libevent*.so* mr, - ${pkgs.curl}/lib/libcurl*.so* mr, - ${pkgs.openssl}/lib/libssl*.so* mr, - ${pkgs.openssl}/lib/libcrypto*.so* mr, - ${pkgs.zlib}/lib/libz*.so* mr, - ${pkgs.libssh2}/lib/libssh2*.so* mr, - ${pkgs.systemd}/lib/libsystemd*.so* mr, - ${pkgs.xz}/lib/liblzma*.so* mr, - ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr, + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.libevent}/lib/libevent*.so* mr, + ${pkgs.curl}/lib/libcurl*.so* mr, + ${pkgs.openssl}/lib/libssl*.so* mr, + ${pkgs.openssl}/lib/libcrypto*.so* mr, + ${pkgs.zlib}/lib/libz*.so* mr, + ${pkgs.libssh2}/lib/libssh2*.so* mr, + ${pkgs.systemd}/lib/libsystemd*.so* mr, + ${pkgs.xz}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr, ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr, + ${pkgs.libnghttp2}/lib/libnghttp2*.so* mr, + ${pkgs.c-ares}/lib/libcares*.so* mr, + ${pkgs.libcap}/lib/libcap*.so* mr, + ${pkgs.attr}/lib/libattr*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, + ${pkgs.openssl}/etc/** r, ${pkgs.transmission}/share/transmission/** r, owner ${settingsDir}/** rw, From e62a90767e8abb01bcd795f6b36fbc3f1e9cef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Thu, 10 Dec 2015 19:11:26 +0100 Subject: [PATCH 204/498] phpPackages.composer: 1.0.0-alpha10 -> 1.0.0-alpha11 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 96c4ab06a51..02ff5a3653e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -115,11 +115,11 @@ let self = with self; { composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.0.0-alpha10"; + version = "1.0.0-alpha11"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0a26zlsr2jffcqlz8z6l8s6c6nlyfj2gxqfgx76knx5wch1psb4z"; + sha256 = "1b41ad352p4296c2j7cdq27wp06w28080bjxnjpmw536scb7yd27"; }; phases = [ "installPhase" ]; From 94ad6e44448db1037deec9134eb64f050668c3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Andr=C3=A9?= Date: Thu, 10 Dec 2015 19:17:06 +0100 Subject: [PATCH 205/498] nixos-manual: fix grammar --- nixos/doc/manual/administration/declarative-containers.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index dccc8b0cb0d..f3f65edcec2 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -23,7 +23,7 @@ containers.database = If you run nixos-rebuild switch, the container will be built. If the container was already running, it will be -updated in place, without rebooting. Container can be configured to +updated in place, without rebooting. The container can be configured to start automatically by setting containers.database.autoStart = true in its configuration. From 6037db59c6cf946aee0b1ba3f1b66558539a18d9 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Fri, 11 Dec 2015 02:19:12 +0800 Subject: [PATCH 206/498] nanomsg: 0.4-beta -> 0.8-beta --- pkgs/development/libraries/nanomsg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index ef673d115ac..4d9e49a54d9 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.4-beta"; + version = "0.8-beta"; name = "nanomsg-${version}"; src = fetchurl { - url = "http://download.nanomsg.org/${name}.tar.gz"; - sha256 = "0bgjj1x1a991pckw4nm5bkmbibjsf74y0ns23fpk4jj5dwarhm3d"; + url = "https://github.com/nanomsg/nanomsg/releases/download/0.8-beta/${name}.tar.gz"; + sha256 = "0ix9yd6shqmgm1mxig8ww2jpbgg2n5dms0wrv1q81ihclml0rkkm"; }; installPhase = '' From bd5ad569aaf9875deb2c93797588310f3642da91 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 10 Dec 2015 13:25:32 -0500 Subject: [PATCH 207/498] pencil: v2.0.14 -> v2.0.15 --- pkgs/applications/graphics/pencil/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index a067efe82ea..8ee39c135ef 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, makeWrapper, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.14"; + version = "2.0.15"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "59f46db863e6d95ee6987e600d658ad4b58b03b0744c5c6d17ce04f5ae92d260"; - + sha256 = "be338558b613f51506337a2c7c80f209e8644656c2925f41c294e2872feabc3b"; }; buildPhase = ""; From c840974c2466288b49e5ad73599f497e6465ffd4 Mon Sep 17 00:00:00 2001 From: Nicole Angel Date: Thu, 10 Dec 2015 19:52:08 +0100 Subject: [PATCH 208/498] grub: fix typo in variable name (trivial) --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 5f09e937537..87dbbd7cd51 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -470,7 +470,7 @@ in ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; - message = "A boot path cannot have an empty devices string in ${arg.path}"; + message = "A boot path cannot have an empty devices string in ${args.path}"; } { assertion = hasPrefix "/" args.path; From 9933e5868ddc33adc76d8fa873258ce6026db677 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 10 Dec 2015 20:25:46 +0100 Subject: [PATCH 209/498] rustRegistry: 2015-11-01 -> 2015-12-10 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 907196d3dbe..9fee03b701e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-11-01"; - rev = "a0534d1729e07f2bc3fe936342e33ce380dd0735"; + version = "2015-12-10"; + rev = "22d6577ebaf063f121fb8dc7dd3b53b73a75f453"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0r8kn7ci9r6s6rb4h3qd8xiyl59llwv39db7s42j35fg7z8wbxk0"; + sha256 = "10hqb8pwi5bcxc96ddijjswxjv8yqh54w7r3x1xsz2i7160z8gs6"; }; in From 414a1660f4067aa3d6f92fe9a18f54e8d42afc1d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 10 Dec 2015 21:35:33 +0100 Subject: [PATCH 210/498] eclipse-plugin-testng: 6.9.10.201511281504 -> 6.9.10.201512020421 --- pkgs/applications/editors/eclipse/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 5a5c31c5609..9e6002e9398 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -335,16 +335,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.10.201511281504"; + version = "6.9.10.201512020421"; srcFeature = fetchurl { - url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar"; - sha256 = "1kjaifa1fc16yh82bzp5xa5pn3kgrpgc5jq55lyvgz29vjj6ss97"; + url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; + sha256 = "17y0cb1xprldjav14iy2sinv7lcw4xnjs2fwz9gl41m9m1c0hajk"; }; srcPlugin = fetchurl { - url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "1njz4ynjwnhjjbsszfgqyjn2ixxzjv8qvnc7dqz8jldrz3jrjf07"; + url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; + sha256 = "1iwq0ifk9l56z11vhy5yscvl8l1xk6igkp103v9vwvcx6nlmkfgc"; }; meta = with stdenv.lib; { From 332c35fa6ca33d749774a0509a5e56e8be0a5058 Mon Sep 17 00:00:00 2001 From: John Chee Date: Thu, 10 Dec 2015 14:26:34 -0800 Subject: [PATCH 211/498] goPackages.json2csv: init at d82e60e6dc2a7d3bcf15314d1ecbebeffaacf0c6 --- pkgs/top-level/go-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 70dda19bc8e..d20f4ae7549 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1696,6 +1696,13 @@ let disabled = isGo14; }; + json2csv = buildFromGitHub{ + rev = "d82e60e6dc2a7d3bcf15314d1ecbebeffaacf0c6"; + owner = "jehiah"; + repo = "json2csv"; + sha256 = "1fw0qqaz2wj9d4rj2jkfj7rb25ra106p4znfib69p4d3qibfjcsn"; + }; + ldap = buildGoPackage rec { rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; From b670cec4acf2e4d5d799a9b8140b52dbe838ff2b Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 10 Dec 2015 17:25:49 -0500 Subject: [PATCH 212/498] libsass: v3.2.4 -> v3.3.2 --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 356891e7351..9efe07c6567 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.2.4"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1v804r7k0iv97ihlr46hwfw88v874kfklsm616b85yzdz0105i8h"; + sha256 = "affb7efaa7e152e576cc1d510c662ebe067b0b9e9228ad2937dcafdd4431b573"; }; patchPhase = '' From 2de85bd7e5369e13be7d08092ae7b0dad4a1250e Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 10 Dec 2015 17:26:26 -0500 Subject: [PATCH 213/498] sassc: v3.2.4 -> v3.3.2 --- pkgs/development/tools/sassc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 256bd93f1ab..1e990b0e2e9 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sassc-${version}"; - version = "3.2.4"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "0ksdfv9ff5smba4vbwr1wqf3bp908rnprkp6lfssj85h9ciqq896"; + sha256 = "15a2b2698639dfdc7bd6a5ba7a9ecdaf8ebb9f15503fb04dea1be3133308e41d"; }; patchPhase = '' From c4ab553c925f1cfb83eaea5a2b38b1480e8bb17e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 10 Dec 2015 23:09:31 +0100 Subject: [PATCH 214/498] screen: patch CVE-2015-6806 Fixes a possible denial of service of the screen tool. Patch sourced from upstream GIT repository. --- pkgs/tools/misc/screen/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 8c132d5ba02..3e130154e46 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pam ? null }: +{ stdenv, fetchurl, fetchpatch, ncurses, pam ? null }: stdenv.mkDerivation rec { name = "screen-4.3.1"; @@ -13,8 +13,15 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - # TODO: remove when updating the version of screen. Only a patch for 4.3.1 - patches = stdenv.lib.optional stdenv.isDarwin (fetchurl { + # TODO: remove when updating the version of screen. Only patches for 4.3.1 + patches = [ + (fetchpatch { + name = "CVE-2015-6806.patch"; + stripLen = 1; + url = "http://git.savannah.gnu.org/cgit/screen.git/patch/?id=b7484c224738247b510ed0d268cd577076958f1b"; + sha256 = "160zhpzi80qkvwib78jdvx4jcm2c2h59q5ap7hgnbz4xbkb3k37l"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin (fetchurl { url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815"; sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc"; }); From de327c7db7b0d6bb0b7588b2574e54779af0bad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Fri, 11 Dec 2015 01:24:05 +0100 Subject: [PATCH 215/498] fixes #11618: make php and phpPackages extension directory consistent --- pkgs/development/interpreters/php/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1acd5c4a522..2c554648290 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -21,6 +21,8 @@ let buildInputs = [ flex bison pkgconfig ]; + configureFlags = ["EXTENSION_DIR=$(out)/lib/php/extensions"]; + flags = { # much left to do here... From c85ada394f495f3a7277253896ecb584dde8d496 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Wed, 9 Dec 2015 05:46:02 +0100 Subject: [PATCH 216/498] rkt: add service --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/rkt.nix | 62 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 nixos/modules/virtualisation/rkt.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9fc1d54bd84..9bd35ded039 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -507,6 +507,7 @@ ./virtualisation/amazon-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix new file mode 100644 index 00000000000..7b4d46e0749 --- /dev/null +++ b/nixos/modules/virtualisation/rkt.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.rkt; +in +{ + options.virtualisation.rkt = { + enable = mkEnableOption "rkt metadata service"; + + gc = { + automatic = mkOption { + default = true; + type = types.bool; + description = "Automatically run the garbage collector at a specific time."; + }; + + dates = mkOption { + default = "03:15"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 5) of the time at + which the garbage collector will run. + ''; + }; + + options = mkOption { + default = "--grace-period=24h"; + type = types.str; + description = '' + Options given to rkt gc when the + garbage collector is run automatically. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.rkt ]; + + systemd.services.rkt = { + description = "rkt metadata service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.rkt}/bin/rkt metadata-service"; + }; + }; + + systemd.services.rkt-gc = { + description = "rkt garbage collection"; + startAt = optionalString cfg.gc.automatic cfg.gc.dates; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; + }; + }; + }; +} From 1fe89386fd7a0325e7c6e313eabcfc43c369269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Fri, 11 Dec 2015 07:55:00 +0100 Subject: [PATCH 217/498] i3blocks: 1.4 (NEW) (WIP) --- .../window-managers/i3/blocks.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/blocks.nix diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix new file mode 100644 index 00000000000..466c5b7ec6f --- /dev/null +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "i3blocks-${version}"; + version = "1.4"; + + src = fetchurl { + url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz"; + sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; + }; + + makeFlags = "all"; + installFlags = "PREFIX=\${out} VERSION=${version}"; + + meta = with stdenv.lib; { + description = "A flexible scheduler for your i3bar blocks."; + homepage = https://github.com/vivien/i3blocks; + license = licenses.gpl3; + maintainers = [ "MindTooth" ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f507b8481..9272c8376ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12087,6 +12087,8 @@ let xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; + i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; }; From 9104aae0a4550e1a04455e8972919f172c58397f Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Fri, 11 Dec 2015 09:04:46 +0100 Subject: [PATCH 218/498] gnome-music: add missing requests2 dependency --- pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix index bb89ef84202..f48feb20579 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg python3 - gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify + python3Packages.pycairo python3Packages.dbus python3Packages.requests2 + python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; wrapPrefixVariables = [ "PYTHONPATH" ]; From 565707c57abc6ee9e81d4f6c9bd5fed5bbac2d40 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 11 Dec 2015 11:17:06 +0300 Subject: [PATCH 219/498] set all_proxy environment variable --- nixos/modules/config/networking.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index b49f8a156d1..293a42d38b5 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -96,6 +96,15 @@ in example = "http://127.0.0.1:3128"; }; + allProxy = lib.mkOption { + type = types.nullOr types.str; + default = cfg.proxy.default; + description = '' + This option specifies the all_proxy environment variable. + ''; + example = "http://127.0.0.1:3128"; + }; + noProxy = lib.mkOption { type = types.nullOr types.str; default = null; @@ -183,6 +192,8 @@ in rsync_proxy = cfg.proxy.rsyncProxy; } // optionalAttrs (cfg.proxy.ftpProxy != null) { ftp_proxy = cfg.proxy.ftpProxy; + } // optionalAttrs (cfg.proxy.allProxy != null) { + all_proxy = cfg.proxy.allProxy; } // optionalAttrs (cfg.proxy.noProxy != null) { no_proxy = cfg.proxy.noProxy; }; From ffb72182a6f24f1da90961f34450ee66c2680a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 11 Dec 2015 10:24:27 +0100 Subject: [PATCH 220/498] blas: fix remains of hardcoded version Thanks to @knedlsepp for pointing out https://github.com/NixOS/nixpkgs/commit/2b71fdbbc36e560b73da5a6a6c10505f82decc80#commitcomment-14919659 --- .../libraries/science/math/blas/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 07b1e8877fb..376c80962cd 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, gfortran }: - +let + version = "3.5.0"; +in stdenv.mkDerivation rec { - name = "blas-3.5.0"; + name = "blas-${version}"; src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { echo >>make.inc "ARCH = gfortran" echo >>make.inc "ARCHFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" - echo >>make.inc "BLASLIB = libblas.so.3.0.3" + echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' @@ -39,9 +41,9 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + '' install ${dashD} -m755 libblas.a "$out/lib/libblas.a" - install ${dashD} -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3" - ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3" - ln -s libblas.so.3.0.3 "$out/lib/libblas.so" + install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" + ln -s libblas.so.${version} "$out/lib/libblas.so.3" + ln -s libblas.so.${version} "$out/lib/libblas.so" ''; meta = { From 39b8e3808daabe9ac2fd6889bfa6866fc0cd942c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 17:20:25 +0100 Subject: [PATCH 221/498] python numeric: remove package numeric was superseded by numpy about 10 years ago. I think we can remove it... --- .../python-modules/numeric/default.nix | 40 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/python-modules/numeric/default.nix diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix deleted file mode 100644 index 0d6d5b0ffed..00000000000 --- a/pkgs/development/python-modules/numeric/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, python }: - -let version = "24.2"; in - stdenv.mkDerivation { - name = "python-numeric-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/numpy/Numeric-${version}.tar.gz"; - sha256 = "0n2jy47n3d121pky4a3r0zjmk2vk66czr2x3y9179xbgxclyfwjz"; - }; - - buildInputs = [ python ]; - - buildPhase = ''python setup.py build --build-base "$out"''; - installPhase = '' - python setup.py install --prefix "$out" - - # Remove the `lib.linux-i686-2.5' and `temp.linux-i686-2.5' (or - # similar) directories. - rm -rf $out/lib.* $out/temp.* - ''; - - # FIXME: Run the tests. - - meta = { - description = "A Python module for high-performance, numeric computing"; - - longDescription = '' - Numeric is a Python module for high-performance, numeric - computing. It provides much of the functionality and - performance of commercial numeric software such as Matlab; it - some cases, it provides more functionality than commercial - software. - ''; - - license = "Python+LLNL"; - - homepage = http://people.csail.mit.edu/jrennie/python/numeric/; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9272c8376ac..9c757ae34ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9017,7 +9017,6 @@ let ecdsa = callPackage ../development/python-modules/ecdsa { }; - numeric = callPackage ../development/python-modules/numeric { }; psyco = callPackage ../development/python-modules/psyco { }; From 0b83f714866ea38bd9123f06b72c86c845cad3df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 17:21:25 +0100 Subject: [PATCH 222/498] python ecdsa: remove duplicate ecdsa was specified in python-modules/ and in python-packages.nix. --- .../python-modules/ecdsa/default.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/python-modules/ecdsa/default.nix diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix deleted file mode 100644 index a07eceb45aa..00000000000 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, openssl }: - -buildPythonPackage rec { - name = "ecdsa-0.11"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz"; - sha256 = "134mbq5xsvx54k9xm7zrizvh9imxmcz1w9mhyfr99p4i7wcnqfwf"; - }; - - buildInputs = [ openssl ]; - - meta = { - homepage = "http://github.com/warner/python-ecdsa"; - description = "Pure-python ECDSA signature/verification"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c757ae34ec..caba5a48b54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9015,8 +9015,8 @@ let bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - ecdsa = callPackage ../development/python-modules/ecdsa { }; + ecdsa = pythonPackages.ecdsa; psyco = callPackage ../development/python-modules/psyco { }; From 7a8671a905254dd93f738cae5cc42139be29b9ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Dec 2015 17:22:51 +0100 Subject: [PATCH 223/498] python foursuite: move callPackage to python-packages.nix --- pkgs/top-level/all-packages.nix | 3 +-- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caba5a48b54..332dd983f0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9011,9 +9011,8 @@ let self = pypyPackages; }); - foursuite = callPackage ../development/python-modules/4suite { }; - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + foursuite = pythonPackages.foursuite; ecdsa = pythonPackages.ecdsa; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84da0312e3..b836b90907a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7628,6 +7628,8 @@ in modules // { }; }); + foursuite = callPackage ../development/python-modules/4suite {}; + fs = buildPythonPackage rec { name = "fs-0.5.0"; From aa4777c45b17e98f239c78eef31cf7804abb773b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 10:37:58 +0100 Subject: [PATCH 224/498] python: remove psyco --- pkgs/development/python-modules/psyco/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/python-modules/psyco/default.nix diff --git a/pkgs/development/python-modules/psyco/default.nix b/pkgs/development/python-modules/psyco/default.nix deleted file mode 100644 index 1bdade67d68..00000000000 --- a/pkgs/development/python-modules/psyco/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, python}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "psyco-1.5.2"; - src = fetchurl { - url = mirror://sourceforge/psyco/psyco-1.5.2-src.tar.gz; - md5 = "bceb17423d06b573dc7b875d34e79417"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 332dd983f0a..9bfc7691f73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9017,8 +9017,6 @@ let ecdsa = pythonPackages.ecdsa; - psyco = callPackage ../development/python-modules/psyco { }; - pycairo = pythonPackages.pycairo; pycapnp = pythonPackages.pycapnp; From 318fa0732dce01c4a40879d8b37d2e48cf7213d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 09:17:07 +0100 Subject: [PATCH 225/498] castle_combat: mark as broken due to pygame error. --- pkgs/games/castle-combat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index 789b043e18f..d4f8f7cec7a 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -49,6 +49,8 @@ export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${doll # No test suite. doCheck = false; + broken = true; # pygame.error: Unrecognized music format + meta = { description = "Castle-Combat, a clone of the old arcade game Rampart"; From 66f663e192d90c42c6cef01cfd3d5e1e1c111343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 09:18:34 +0100 Subject: [PATCH 226/498] castle_combat: remove game It was broken already (pygame sound error), and also requires numeric which is being removed. --- pkgs/games/castle-combat/default.nix | 71 ---------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/games/castle-combat/default.nix diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix deleted file mode 100644 index d4f8f7cec7a..00000000000 --- a/pkgs/games/castle-combat/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ fetchurl, stdenv, buildPythonPackage, pygame, twisted, numeric, makeWrapper }: - -buildPythonPackage rec { - name = "castle-combat-0.8.1"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://sourceforge/castle-combat/${name}.tar.gz"; - sha256 = "1hp4y5dgj88j9g44h4dqiakrgj8lip1krlrdl2qpffin08agrvik"; - }; - - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = - [ pygame twisted - - # XXX: `Numeric.pth' should be found by Python but it's not. - # Gobolinux has the same problem: - # http://bugs.python.org/issue1431 . - numeric - ]; - - patchPhase = '' - sed -i "src/common.py" \ - -e "s|^data_path *=.*$|data_path = \"$out/share/${name}\"|g" - - mv -v "src/"*.py . - sed -i "setup.py" -e's/"src"/""/g' - ''; - - postInstall = '' - mkdir -p "$out/share/${name}" - cp -rv "data/"* "$out/share/${name}" - - mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat" - ''; - - postPhases = "fixLoaderPath"; - - fixLoaderPath = - let dollar = "\$"; in - '' sed -i "$out/bin/castle-combat" \ - -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ -export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" - ''; - # ^ - # `--- The run-time says: "libgcc_s.so.1 must be installed for - # pthread_cancel to work", which means it needs help to find it. - - # No test suite. - doCheck = false; - - broken = true; # pygame.error: Unrecognized music format - - meta = { - description = "Castle-Combat, a clone of the old arcade game Rampart"; - - longDescription = '' - Castle-Combat is a clone of the old arcade game Rampart. Up to - four players (or more in future versions) build castle walls, - place cannons inside these walls, and shoot at the walls of - their enemy(s). If a player cannot build a complete wall around - one of his castles, he loses. The last surviving player wins. - ''; - - homepage = http://www.linux-games.com/castle-combat/; - - license = "unknown"; - - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bfc7691f73..69dfafb4ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13958,8 +13958,6 @@ let bzflag = callPackage ../games/bzflag { }; - castle_combat = callPackage ../games/castle-combat { }; - cataclysm-dda = callPackage ../games/cataclysm-dda { }; chessdb = callPackage ../games/chessdb { }; From fa45088ae9f42fcdd52d24210050a0d5e2a61cc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:02:36 +0100 Subject: [PATCH 227/498] python bsddb3: move and update expression The updated expression uses buildPythonPackage and thus installs a wheel. Unfortunately, setting the --berkeley-db flag seems to fail. --- .../python-modules/bsddb3/default.nix | 12 --------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 26 +++++++++++++++++++ 3 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/python-modules/bsddb3/default.nix diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix deleted file mode 100644 index bd5b953f048..00000000000 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, python, db}: - -stdenv.mkDerivation rec { - name = "bsddb3-6.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69dfafb4ef5..96f70e77559 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9011,9 +9011,9 @@ let self = pypyPackages; }); - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; foursuite = pythonPackages.foursuite; + bsddb3 = pythonPackages.bsddb3; ecdsa = pythonPackages.ecdsa; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b836b90907a..af2fd384386 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1673,6 +1673,32 @@ in modules // { }; }; + bsddb3 = buildPythonPackage rec { + name = "bsddb3-${version}"; + version = "6.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; + sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; + }; + + buildInputs = [ pkgs.db ]; + + # Path to database need to be set. + # Somehow the setup.py flag is not propagated. + #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ]; + # We can also use a variable + preConfigure = '' + export BERKELEYDB_DIR=${pkgs.db}; + ''; + + meta = { + description = "Python bindings for Oracle Berkeley DB"; + homepage = http://www.jcea.es/programacion/pybsddb.htm; + license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x + }; + }; + bokeh = buildPythonPackage rec { name = "bokeh-${version}"; version = "0.10.0"; From dbdfda7871b096a76bb9ab3f3706a614a3de3bff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 09:53:11 +0100 Subject: [PATCH 228/498] python bsddb3: 6.1.0 -> 6.1.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 af2fd384386..5a188d488d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1675,11 +1675,11 @@ in modules // { bsddb3 = buildPythonPackage rec { name = "bsddb3-${version}"; - version = "6.1.0"; + version = "6.1.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; + sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3"; }; buildInputs = [ pkgs.db ]; From 88bcfa64418cce711e30cf21723fe99f3a6be885 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:04:56 +0100 Subject: [PATCH 229/498] python pycups: 1.9.68 -> 1.9.73 and move expression --- .../python-modules/pycups/default.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/python-modules/pycups/default.nix diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix deleted file mode 100644 index 766dcaa58f7..00000000000 --- a/pkgs/development/python-modules/pycups/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, python, cups }: - -let version = "1.9.68"; in - -stdenv.mkDerivation { - name = "pycups-${version}"; - - src = fetchurl { - url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; - sha256 = "1i1ph9k1wampa7r6mgc30a99w0zjmxhvcxjxrgjqa5vdknynqd24"; - }; - - installPhase = '' - CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out - ''; - - buildInputs = [ python cups ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96f70e77559..25c6be1e6c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9023,7 +9023,7 @@ let pycrypto = pythonPackages.pycrypto; - pycups = callPackage ../development/python-modules/pycups { }; + pycups = pythonPackages.pycups; pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a188d488d7..3b683477bc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14150,6 +14150,24 @@ in modules // { }; }); + pycups = buildPythonPackage rec { + name = "pycups-${version}"; + version = "1.9.73"; + + src = pkgs.fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ pkgs.cups ]; + + meta = { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; + + }; pycurl = buildPythonPackage (rec { name = "pycurl-7.19.5"; From 292b943ec6c9a9dc0c33190a36743845142ad8c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:06:38 +0100 Subject: [PATCH 230/498] python pyqt4: use version already in python-packages.nix --- 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 25c6be1e6c7..a75f13d8ab6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9045,7 +9045,7 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; + pyqt4 = pythonPackages.pyqt4; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; From bc97b365d35afcb25800de54d9668f15352f71ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:07:39 +0100 Subject: [PATCH 231/498] python pygame: move callPackage to python-packages.nix --- pkgs/development/python-modules/pygame/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 3a24767ae4e..321a0b49b08 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k, }: buildPythonPackage { @@ -15,6 +15,9 @@ buildPythonPackage { smpeg portmidi libX11 ]; + # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found + disabled = isPy3k; + patches = [ ./pygame-v4l.patch ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75f13d8ab6..1dfe8cabf1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9027,7 +9027,7 @@ let pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; - pygame = callPackage ../development/python-modules/pygame { }; + pygame = pythonPackages.pygame; pygobject = pythonPackages.pygobject; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3b683477bc6..4764bca3bfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -142,6 +142,8 @@ in modules // { pycrypto = callPackage ../development/python-modules/pycrypto { }; + pygame = callPackage ../development/python-modules/pygame { }; + pygobject = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; From 4c0bc553f5bd48919ee22d0e63ed47ccd560b506 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:08:01 +0100 Subject: [PATCH 232/498] python pygtksourceview: move callPackage to python-packages.nix --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dfe8cabf1d..06f01abee73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9035,7 +9035,7 @@ let pygtk = pythonPackages.pygtk; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + pygtksourceview = pythonPackages.pygtksourceview; pyGtkGlade = pythonPackages.pyGtkGlade; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4764bca3bfc..5f9c3187020 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in modules // { pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome.libglade; }; From 3e75b475f83713567e3d305dd3814ba93bc13f10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:31:34 +0100 Subject: [PATCH 233/498] python pyx: 0.10 -> 0.14.1 rewrite expression - Update version - Rewrite expression using buildPythonPackage - Current version only works of PyX only works with Python >= 3.2 --- .../python-modules/pyx/default.nix | 40 ------------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 18 +++++++++ 3 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/pyx/default.nix diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix deleted file mode 100644 index cc36680fcb0..00000000000 --- a/pkgs/development/python-modules/pyx/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, python, makeWrapper}: - -stdenv.mkDerivation rec { - name = "PyX-0.10"; - src = fetchurl { - url = "mirror://sourceforge/pyx/${name}.tar.gz"; - sha256 = "dfaa4a7790661d67d95f80b22044fdd8a9922483631950296ff1d7a9f85c8bba"; - }; - - patchPhase = '' - substituteInPlace ./setup.py --replace '"/etc"' '"etc"' - ''; - - buildInputs = [python makeWrapper]; - buildPhase = "python ./setup.py build"; - installPhase = '' - python ./setup.py install --prefix="$out" || exit 1 - - for i in "$out/bin/"* - do - # FIXME: We're assuming Python 2.4. - wrapProgram "$i" --prefix PYTHONPATH : \ - "$out/lib/python2.4/site-packages" || \ - exit 2 - done - ''; - - meta = { - description = ''Python graphics package''; - longDescription = '' - PyX is a Python package for the creation of PostScript and PDF - files. It combines an abstraction of the PostScript drawing - model with a TeX/LaTeX interface. Complex tasks like 2d and 3d - plots in publication-ready quality are built out of these - primitives. - ''; - license = stdenv.lib.licenses.gpl2; - homepage = http://pyx.sourceforge.net/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06f01abee73..a920636a3d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9057,8 +9057,6 @@ let pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; - pyx = callPackage ../development/python-modules/pyx { }; - pyxml = callPackage ../development/python-modules/pyxml { }; rbtools = callPackage ../development/python-modules/rbtools { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f9c3187020..d3f2b076902 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14450,6 +14450,24 @@ in modules // { }; }; + pyx = buildPythonPackage rec { + name = "pyx-${version}"; + version = "0.14.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyX/PyX-${version}.tar.gz"; + sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912"; + }; + + disabled = !isPy3k; + + meta = { + description = "Python package for the generation of PostScript, PDF, and SVG files"; + homepage = http://pyx.sourceforge.net/; + license = with licenses; [ gpl2 ]; + }; + }; + mmpython = buildPythonPackage rec { version = "0.4.10"; name = "mmpython-${version}"; From f9acc95a09b09096fd3a69d6861a2c9fc9cebaf7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:40:48 +0100 Subject: [PATCH 234/498] python rbtools: move expression to python-packages.nix cc @domenkozar --- .../python-modules/rbtools/default.nix | 17 ---------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/python-modules/rbtools/default.nix diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix deleted file mode 100644 index b6375081551..00000000000 --- a/pkgs/development/python-modules/rbtools/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, python }: - -pythonPackages.buildPythonPackage rec { - name = "rbtools-0.7.2"; - namePrefix = ""; - - src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; - sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; - }; - - propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ]; - - meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a920636a3d6..20f1faae1bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9059,7 +9059,7 @@ let pyxml = callPackage ../development/python-modules/pyxml { }; - rbtools = callPackage ../development/python-modules/rbtools { }; + rbtools = pythonPackages.rbtools; setuptools = pythonPackages.setuptools; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3f2b076902..b9db41d6ed9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15618,6 +15618,26 @@ in modules // { }; }; + rbtools = buildPythonPackage rec { + name = "rbtools-0.7.2"; + + src = pkgs.fetchurl { + url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; + sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ modules.sqlite3 six ]; + + checkPhase = "nosetests"; + + disabled = isPy3k; + + meta = { + maintainers = with maintainers; [ iElectric ]; + }; + }; + rencode = buildPythonPackage rec { name = "rencode-${version}"; version = "git20150810"; From e60da70c3bed490ead40c7d4a77f4b455dbd1ebd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 10:46:04 +0100 Subject: [PATCH 235/498] python slowaes: move expression to python-packages.nix --- .../python-modules/slowaes/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/python-modules/slowaes/default.nix diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix deleted file mode 100644 index e45ffdfb2e1..00000000000 --- a/pkgs/development/python-modules/slowaes/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage }: - -buildPythonPackage rec { - name = "slowaes-0.1a1"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; - sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; - }; - - meta = { - homepage = "http://code.google.com/p/slowaes/"; - description = "AES implemented in pure python"; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1faae1bb..d183f588a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9063,7 +9063,7 @@ let setuptools = pythonPackages.setuptools; - slowaes = callPackage ../development/python-modules/slowaes { }; + slowaes = pythonPackages.slowaes; wxPython = pythonPackages.wxPython; wxPython28 = pythonPackages.wxPython28; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9db41d6ed9..d2d1abb7238 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16917,6 +16917,24 @@ in modules // { }; }; + slowaes = buildPythonPackage rec { + name = "slowaes-${version}"; + version = "0.1a1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; + sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; + }; + + disabled = isPy3k; + + meta = { + homepage = "http://code.google.com/p/slowaes/"; + description = "AES implemented in pure python"; + license = with licenses; [ asl20 ]; + }; + }; + snowballstemmer = buildPythonPackage rec { name = "snowballstemmer-1.2.0"; From 3c5e03d8c064d2d1baea9fb88b52686f012d58b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:14:41 +0100 Subject: [PATCH 236/498] python xmpppy: move expression to python-packages.nix --- .../python-modules/xmpppy/default.nix | 22 ------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/xmpppy/default.nix diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index b1500b01972..00000000000 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage, fetchurl, setuptools }: - -buildPythonPackage rec { - name = "xmpp.py-${version}"; - version = "0.5.0rc1"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; - sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; - }; - - buildInputs = [ setuptools ]; - - preInstall = '' - mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - ''; - - meta = { - description = "XMPP python library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d183f588a8e..a20438ae340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3635,7 +3635,7 @@ let xmltv = callPackage ../tools/misc/xmltv { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; + xmpppy = pythonPackages.xmpppy; xorriso = callPackage ../tools/cd-dvd/xorriso { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2d1abb7238..5257702dbb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22382,6 +22382,27 @@ in modules // { }; }; + xmpppy = buildPythonPackage rec { + name = "xmpp.py-${version}"; + version = "0.5.0rc1"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; + sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; + }; + + preInstall = '' + mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) + export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) + ''; + + disabled = isPy3k; + + meta = { + description = "XMPP python library"; + }; + }; + xstatic-bootbox = buildPythonPackage rec { name = "XStatic-Bootbox-${version}"; version = "4.3.0.1"; From 442ed86b15e55d6a3650d402bfc63353f0c7d427 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 11 Dec 2015 10:22:28 +0000 Subject: [PATCH 237/498] pkgs.xorriso: 1.4.0 -> 1.4.2 See release announcement at https://lists.gnu.org/archive/html/info-gnu/2015-11/msg00011.html --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 29d483f725f..8dd4c709b01 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.4.0"; + name = "xorriso-1.4.2"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0mhfxn2idkrw1i65a5y4gnb1fig85zpnszb9ax7w4a2v062y1l8b"; + sha256 = "1cq4a0904lnz6nygbgarnlq49cz4qnfdyvz90s3nfk5as7gbwhr8"; }; doCheck = true; From d2b7b5660b14525b27b1eb90082e8cdd130c6031 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:20:16 +0100 Subject: [PATCH 238/498] python mygpoclient: move expression to python-packages.nix --- .../python-modules/mygpoclient/default.nix | 28 ----------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 30 +++++++++++++++++++ 3 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/mygpoclient/default.nix diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix deleted file mode 100644 index a901ce774c5..00000000000 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }: - -buildPythonPackage rec { - name = "mygpoclient-1.7"; - - src = fetchurl { - url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; - sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; - }; - - buildInputs = with pythonPackages; [ nose minimock ]; - - checkPhase = '' - nosetests - ''; - - meta = { - description = "A gpodder.net client library"; - longDescription = '' - The mygpoclient library allows developers to utilize a Pythonic interface - to the gpodder.net web services. - ''; - homepage = "https://thp.io/2010/mygpoclient/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.skeidel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a20438ae340..584fedb4725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7872,7 +7872,7 @@ let muparser = callPackage ../development/libraries/muparser { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mygpoclient = pythonPackages.mygpoclient; mygui = callPackage ../development/libraries/mygui {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5257702dbb1..9ea72de19bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10189,6 +10189,36 @@ in modules // { }; }); + mygpoclient = buildPythonPackage rec { + name = "mygpoclient-${version}"; + version = "1.7"; + + src = pkgs.fetchurl { + url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; + sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; + }; + + buildInputs = with self; [ nose minimock ]; + + checkPhase = '' + nosetests + ''; + + disabled = isPy3k; + + meta = { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = https://thp.io/2010/mygpoclient/; + license = with licenses; [ gpl3 ]; + platforms = with platforms; [ linux darwin ]; + maintainers = with maintainers; [ skeidel ]; + }; + }; + plover = buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8"; From 9186d3169ad0bf2b62ee797e6bed30073b1573e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:38:41 +0100 Subject: [PATCH 239/498] python irclib: move expression to python-packages.nix - Use external paver instead of built-in - Only works with Python 2.x --- .../python-modules/irclib/default.nix | 23 ---------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++ 3 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/irclib/default.nix diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix deleted file mode 100644 index 38ae5949229..00000000000 --- a/pkgs/development/python-modules/irclib/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, fetchurl }: - -buildPythonPackage rec { - name = "irclib-${version}"; - version = "0.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; - sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; - }; - - patches = [(fetchurl { - url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw"; - name = "irclib.py.diff"; - sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; - })]; - - patchFlags = "irclib.py"; - - meta = { - description = "Python IRC library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 584fedb4725..7e556c73ea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2818,7 +2818,7 @@ let pythonDBus = dbus_python; - pythonIRClib = callPackage ../development/python-modules/irclib { }; + pythonIRClib = pythonPackages.pythonIRClib; pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ea72de19bf..68483466dc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8774,6 +8774,33 @@ in modules // { propagatedBuildInputs = with self; [ self.nose self.ipython ]; }; + pythonIRClib = buildPythonPackage rec { + name = "irclib-${version}"; + version = "0.4.8"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; + sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; + }; + + patches = [(pkgs.fetchurl { + url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw"; + name = "irclib.py.diff"; + sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; + })]; + + patchFlags = "irclib.py"; + + propagatedBuildInputs = with self; [ paver ]; + + disabled = isPy3k; + meta = { + description = "Python IRC library"; + homepage = https://bitbucket.org/jaraco/irc; + license = with licenses; [ lgpl21 ]; + }; + }; + iso8601 = buildPythonPackage { name = "iso8601-0.1.10"; src = pkgs.fetchurl { From 8a61d3699f2d6b9b62fb0c0c5aab2545add27ca7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:58:38 +0100 Subject: [PATCH 240/498] python pycangjie: call package from python-packages.nix --- pkgs/development/python-modules/pycangjie/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 68a56dedc3a..8001f0b43a9 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie -, sqlite, python3, cython3 +, sqlite, python, cython }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3 + autoconf automake libtool pkgconfig libcangjie sqlite python cython ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e556c73ea8..7181bb65e72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2810,7 +2810,7 @@ let pyatspi = callPackage ../development/python-modules/pyatspi { }; - pycangjie = callPackage ../development/python-modules/pycangjie { }; + pycangjie = pythonPackages.pycangjie; pydb = callPackage ../development/tools/pydb { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68483466dc1..0f84285c5f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -140,6 +140,8 @@ in modules // { pycairo = callPackage ../development/python-modules/pycairo { }; + pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}"; + pycrypto = callPackage ../development/python-modules/pycrypto { }; pygame = callPackage ../development/python-modules/pygame { }; From 6938b74d2cafc24a70a3c627f6c3c0182f6f956d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 12:20:45 +0100 Subject: [PATCH 241/498] python dbus: use callPackage in python-packages.nix --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7181bb65e72..bb235ab056b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6248,9 +6248,7 @@ let dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; - dbus_python = callPackage ../development/python-modules/dbus { - isPyPy = python.executable == "pypy"; - }; + dbus_python = pythonPackages.dbus; # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.tools; From 1d84bff14c090816eed17c8f18140028a3db2937 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 14:18:58 +0100 Subject: [PATCH 242/498] python pycairo: add python.libPrefix --- pkgs/development/python-modules/pycairo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ddaa7eb508e..07a8e05730b 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -2,7 +2,7 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; - name = "pycairo-${version}"; + name = "${python.libPrefix}-pycairo-${version}"; src = if python.is_py3k or false then fetchurl { url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; From 2aa37ad8a292970de9d30c37fdc6b06d54e62bc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 14:19:13 +0100 Subject: [PATCH 243/498] python pycangjie: add python.libPrefix --- pkgs/development/python-modules/pycangjie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 8001f0b43a9..f8ca06eec86 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pycangjie-${version}"; + name = "${python.libPrefix}-pycangjie-${version}"; version = "1.3_rev_${rev}"; rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; From 7d08a9c877c3b43129fc667e6d8dee13f98523c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 14:19:29 +0100 Subject: [PATCH 244/498] python pyqt: add python.libPrefix --- pkgs/development/python-modules/pyqt/4.x.nix | 2 +- pkgs/development/python-modules/pyqt/5.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 92b74c952fa..31294c8dc98 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -3,7 +3,7 @@ let version = "4.11.3"; in stdenv.mkDerivation { - name = "PyQt-x11-gpl-${version}"; + name = "${python.libPrefix}-PyQt-x11-gpl-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b89052602d9..bb1d91b3ca8 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,7 +3,7 @@ let version = "5.4.2"; in stdenv.mkDerivation { - name = "PyQt-${version}"; + name = "${python.libPrefix}-PyQt-${version}"; meta = with stdenv.lib; { description = "Python bindings for Qt5"; From a11c7584ca504e32dcf9ea364589f5984c6eeec0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 21:39:11 +0100 Subject: [PATCH 245/498] python pyside: 1.2.2 -> 1.2.4 --- pkgs/development/python-modules/pyside/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index d274283594a..f81a2fda56c 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: -stdenv.mkDerivation { - name = "pyside-1.2.2"; +stdenv.mkDerivation rec { + name = "${python.libPrefix}-pyside-${version}"; + version = "1.2.4"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2"; - sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1"; + url = "https://github.com/PySide/PySide/archive/${version}.tar.gz"; + sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7"; }; enableParallelBuilding = true; From 2ed93d74d5218607e607b3e63a1f9ed9f34715ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 21:40:00 +0100 Subject: [PATCH 246/498] python pyside shiboken: 1.2.2 -> 1.2.4 --- pkgs/development/python-modules/pyside/shiboken.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 5e266aba7d0..c2550a852f7 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: -stdenv.mkDerivation { - name = "pyside-shiboken-1.2.2"; +stdenv.mkDerivation rec { + name = "${python.libPrefix}-pyside-shiboken-${version}"; + version = "1.2.4"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2"; - sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn"; + url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz"; + sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; }; enableParallelBuilding = true; From 515a13b1f50fad34482457c616e6c5d090c2da3c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:05:26 +0100 Subject: [PATCH 247/498] python pyside: move callPackage to python-packages.nix This should make pyside available for all Python versions. --- .../development/python-modules/pyside/apiextractor.nix | 6 +++--- pkgs/development/python-modules/pyside/default.nix | 2 +- .../python-modules/pyside/generatorrunner.nix | 6 +++--- pkgs/development/python-modules/pyside/shiboken.nix | 9 ++++++--- pkgs/development/python-modules/pyside/tools.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 +++++----- pkgs/top-level/python-packages.nix | 10 ++++++++++ 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index e3bcf059c1c..c7e0cc09f14 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.10"; + name = "${python.libPrefix}-pyside-apiextractor-0.10.10"; src = fetchurl { url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt sphinx qt4 ]; meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index f81a2fda56c..fc009a208b7 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, python, pysideGeneratorrunner, pysideShiboken, qt4 }: stdenv.mkDerivation rec { name = "${python.libPrefix}-pyside-${version}"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 2423cbb0c2e..b576b29dae7 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.16"; + name = "${python.libPrefix}-pyside-generatorrunner-0.6.16"; src = fetchurl { url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + buildInputs = [ cmake pysideApiextractor sphinx qt4 ]; meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index c2550a852f7..549b6275a8c 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: -stdenv.mkDerivation rec { +# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 +if isPy35 then throw "shiboken not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { name = "${python.libPrefix}-pyside-shiboken-${version}"; version = "1.2.4"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; + cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; + meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index b5ddec09c03..facbccdce35 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.15"; + name = "${python.libPrefix}-pyside-tools-0.2.15"; src = fetchurl { url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + buildInputs = [ cmake pyside python qt4 pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb235ab056b..51510e542d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9045,15 +9045,15 @@ let pyqt4 = pythonPackages.pyqt4; - pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + pysideApiextractor = pythonPackages.pysideApiextractor; - pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner; - pyside = callPackage ../development/python-modules/pyside { }; + pyside = pythonPackages.pyside; - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pysideTools = pythonPackages.pysideTools; - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + pysideShiboken = pythonpackages.pysideShiboken; pyxml = callPackage ../development/python-modules/pyxml { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f84285c5f0..86b2822e7ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -169,6 +169,16 @@ in modules // { qt5 = pkgs.qt5; }; + pyside = callPackage ../development/python-modules/pyside { }; + + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + sip = callPackage ../development/python-modules/sip { }; sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; From b2d9b48c979253588f1fa5420c770ed0546473c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 11:08:03 +0100 Subject: [PATCH 248/498] python awscli: move to python-packages.nix --- pkgs/tools/admin/awscli/default.nix | 40 ----------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 38 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 41 deletions(-) delete mode 100644 pkgs/tools/admin/awscli/default.nix diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix deleted file mode 100644 index 39ea3d637fc..00000000000 --- a/pkgs/tools/admin/awscli/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, groff }: - -pythonPackages.buildPythonPackage rec { - name = "awscli-${version}"; - version = "1.9.6"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-cli"; - rev = version; - sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2"; - }; - - propagatedBuildInputs = [ - pythonPackages.botocore - pythonPackages.bcdoc - pythonPackages.six - pythonPackages.colorama - pythonPackages.docutils - pythonPackages.rsa - pythonPackages.pyasn1 - groff - ]; - - postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - rm $out/bin/aws.cmd - ''; - - meta = { - homepage = https://aws.amazon.com/cli/; - description = "Unified tool to manage your AWS services"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ muflax ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51510e542d4..008fb0b8e79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -577,7 +577,7 @@ let avfs = callPackage ../tools/filesystems/avfs { }; - awscli = callPackage ../tools/admin/awscli { }; + awscli = pythonPackages.aswcli; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86b2822e7ea..58239aeb794 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -952,6 +952,44 @@ in modules // { }; })); + awscli = buildPythonPackage rec { + name = "awscli-${version}"; + version = "1.9.6"; + + src = pkgs.fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + rev = version; + sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2"; + }; + + propagatedBuildInputs = with self; [ + botocore + bcdoc + six + colorama + docutils + rsa + pyasn1 + pkgs.groff + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + meta = { + homepage = https://aws.amazon.com/cli/; + description = "Unified tool to manage your AWS services"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ muflax ]; + }; + }; + azure = buildPythonPackage rec { version = "0.11.0"; name = "azure-${version}"; From fe9ef9fd6003291082fede845f3bff5f7413f060 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 11:12:39 +0100 Subject: [PATCH 249/498] python botocore: 1.3.6 -> 1.3.12 --- 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 58239aeb794..2b5c262a9e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1856,12 +1856,12 @@ in modules // { }; botocore = buildPythonPackage rec { - version = "1.3.6"; + version = "1.3.12"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "05a0ihv66fx77j16mjlm76d8zm7sd5wfzh1hx4nm3ilb9gz5h016"; + sha256 = "6f4f09234aca23db2e66c548b98a4fb14516241b31fb473c9c6f5b21270900c6"; }; propagatedBuildInputs = From a82fd1730cb6080d7298ba2438f1262993162de5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 11:12:49 +0100 Subject: [PATCH 250/498] python awscli: 1.9.6 -> 1.9.12 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 008fb0b8e79..2893a5c4370 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -577,7 +577,7 @@ let avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.aswcli; + awscli = pythonPackages.awscli; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b5c262a9e4..5fa5fca5735 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -501,7 +501,6 @@ in modules // { }; }; - anyjson = buildPythonPackage rec { name = "anyjson-0.3.3"; disabled = isPy3k; @@ -954,13 +953,11 @@ in modules // { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.9.6"; + version = "1.9.12"; - src = pkgs.fetchFromGitHub { - owner = "aws"; - repo = "aws-cli"; - rev = version; - sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz"; + sha256 = "0b50de084c8de70adf45c0e938b6350344d9b6acde8b7cdee02cb32964bc58fd"; }; propagatedBuildInputs = with self; [ From 14167636fc6e3501cc27f2d25f9fcd4288f129ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 11:24:56 +0100 Subject: [PATCH 251/498] python ansible: move to python-packages.nix --- pkgs/tools/system/ansible/default.nix | 33 --------------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 31 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/system/ansible/default.nix diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix deleted file mode 100644 index ab5cea30873..00000000000 --- a/pkgs/tools/system/ansible/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }: - -pythonPackages.buildPythonPackage rec { - version = "1.9.4"; - name = "ansible-${version}"; - namePrefix = ""; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - - pythonPath = with pythonPackages; [ - paramiko jinja2 pyyaml httplib2 boto six - ] ++ stdenv.lib.optional windowsSupport pywinrm; - - meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = licenses.gpl3; - maintainers = [ maintainers.joamaki ]; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2893a5c4370..9c9f89835a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5379,7 +5379,7 @@ let augeas = callPackage ../tools/system/augeas { }; - ansible = callPackage ../tools/system/ansible { }; + ansible = pythonPackages.ansible; ansible2 = callPackage ../tools/system/ansible/2.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fa5fca5735..971e952ef47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -556,6 +556,37 @@ in modules // { }; }; + ansible = buildPythonPackage rec { + version = "1.9.4"; + name = "ansible-${version}"; + + src = pkgs.fetchurl { + url = "https://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; + windowsSupport = true; + + propagatedBuildInputs = with self; [ + paramiko jinja2 pyyaml httplib2 boto six + ] ++ optional windowsSupport pywinrm; + + meta = { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with licenses; [ gpl3] ; + maintainers = with maintainers; [ joamaki ]; + platforms = with platforms; [ linux darwin ]; + }; + }; apipkg = buildPythonPackage rec { name = "apipkg-1.4"; From f2ac29648aff2048225324845e73be056f7e58b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 11 Dec 2015 11:25:08 +0100 Subject: [PATCH 252/498] python ansible2: move to python-packages.nix --- pkgs/tools/system/ansible/2.nix | 33 ------------------------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 pkgs/tools/system/ansible/2.nix diff --git a/pkgs/tools/system/ansible/2.nix b/pkgs/tools/system/ansible/2.nix deleted file mode 100644 index 21469e645bb..00000000000 --- a/pkgs/tools/system/ansible/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }: - -pythonPackages.buildPythonPackage rec { - version = "v2.0.0_0.6.rc1"; - name = "ansible-${version}"; - namePrefix = ""; - - src = fetchurl { - url = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz"; - sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - - pythonPath = with pythonPackages; [ - paramiko jinja2 pyyaml httplib2 boto six - ] ++ stdenv.lib.optional windowsSupport pywinrm; - - meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = licenses.gpl3; - maintainers = [ maintainers.copumpkin ]; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c9f89835a2..cc40cbd5e9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5381,7 +5381,7 @@ let ansible = pythonPackages.ansible; - ansible2 = callPackage ../tools/system/ansible/2.nix { }; + ansible2 = pythonPackages.ansible2; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 971e952ef47..bde8d29221c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -587,6 +587,39 @@ in modules // { platforms = with platforms; [ linux darwin ]; }; }; + + ansible2 = buildPythonPackage rec { + version = "v2.0.0_0.6.rc1"; + name = "ansible-${version}"; + + src = pkgs.fetchurl { + url = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz"; + sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; + windowsSupport = true; + + propagatedBuildInputs = with self; [ + paramiko jinja2 pyyaml httplib2 boto six + ] ++ optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ copumpkin ]; + platforms = with platforms; [ linux darwin ]; + }; + }; + apipkg = buildPythonPackage rec { name = "apipkg-1.4"; From fc6d1471ce114dc91085b68337535ea83ca56682 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 11:29:49 +0100 Subject: [PATCH 253/498] linux-testing: Revert build fix for -rc3. This reverts commit 79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415. The commit was from an upstream commit anyway and has since been applied to mainline. Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/linux-testing.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5006f0519eb..54ad2183382 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -19,13 +19,4 @@ import ./generic.nix (args // rec { # Should the testing kernels ever be built on Hydra? extraMeta.hydraPlatforms = []; - kernelPatches = stdenv.lib.singleton { - name = "fix-depmod-cycle"; - patch = fetchurl { - name = "lustre-remove-IOC_LIBCFS_PING_TEST-ioctl.patch"; - url = "https://lkml.org/lkml/diff/2015/11/6/987/1"; - sha256 = "0ja9103f4s65fyn5b6z6lggplnm97hhz4rmpfn4m985yqw7zgihd"; - }; - }; - } // (args.argsOverride or {})) From cebbb18e9e40eb58e20b4c6e89aabbc2a0c4ee3f Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Fri, 11 Dec 2015 10:39:13 +0100 Subject: [PATCH 254/498] R: 3.2.2 -> 3.2.3 --- pkgs/applications/science/math/R/default.nix | 7 +++--- ...x-tests-without-recommended-packages.patch | 24 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7c8e76d676b..183a1f50375 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.2.2"; + name = "R-3.2.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "07a6s865bjnh7w0fqsrkv1pva76w99v86w0w787qpdil87km54cw"; + sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1"; }; buildInputs = [ bzip2 gfortran libX11 libXmu libXt @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { which jdk openblas curl ]; - patches = [ ./no-usr-local-search-paths.patch - ./fix-tests-without-recommended-packages.patch ]; + patches = [ ./no-usr-local-search-paths.patch ]; preConfigure = '' configureFlagsArray=( diff --git a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch b/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch deleted file mode 100644 index c736c7098a3..00000000000 --- a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur R-3.2.2-upstream/tests/reg-packages.R R-3.2.2/tests/reg-packages.R ---- R-3.2.2-upstream/tests/reg-packages.R 2015-08-05 17:45:05.000000000 -0430 -+++ R-3.2.2/tests/reg-packages.R 2015-10-01 02:11:05.484992903 -0430 -@@ -82,7 +82,8 @@ - ## pkgB tests an empty R directory - dir.create(file.path(pkgPath, "pkgB", "R"), recursive = TRUE, - showWarnings = FALSE) --p.lis <- if("Matrix" %in% row.names(installed.packages(.Library))) -+matrixIsInstalled <- "Matrix" %in% row.names(installed.packages(.Library)) -+p.lis <- if(matrixIsInstalled) - c("pkgA", "pkgB", "exNSS4") else "exNSS4" - for(p. in p.lis) { - cat("building package", p., "...\n") -@@ -111,8 +112,8 @@ - tools::assertError(is.null(pkgA:::nilData)) - } - --if(dir.exists(file.path("myLib", "exNSS4"))) { -- for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns) -+if(matrixIsInstalled && dir.exists(file.path("myLib", "exNSS4"))) { -+ for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns) - ## Both exNSS4 and Matrix define "atomicVector" *the same*, - ## but 'exNSS4' has it extended - and hence *both* are registered in cache -> "conflicts" - requireNamespace("exNSS4", lib= "myLib") From be675d6aecc378134186bfdec4574d2b6dc81239 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 14:51:51 +0100 Subject: [PATCH 255/498] python pytest-raisesregexp: init at 2.0 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9247fc4404..ec3c18c4ce2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3198,6 +3198,30 @@ in modules // { }; }; + pytest-raisesregexp = buildPythonPackage rec { + name = "pytest-raisesregexp-${version}"; + version = "2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-raisesregexp/${name}.tar.gz"; + sha256 = "0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61"; + }; + + buildInputs = with self; [ py pytest ]; + + # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 + prePatch = '' + sed -i '3i\import io' setup.py + substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," + ''; + + meta = { + description = "Simple pytest plugin to look for regex in Exceptions"; + homepage = https://github.com/Walkman/pytest_raisesregexp; + license = with licenses; [ mit ]; + }; + }; + pytestrunner = buildPythonPackage rec { version = "2.6.2"; name = "pytest-runner-${version}"; From ffa24484a0ccdc7063e84df8f19aff7d492ac9db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Dec 2015 14:52:04 +0100 Subject: [PATCH 256/498] python aiohttp: init at 0.19.0 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec3c18c4ce2..af69118403c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,6 +311,29 @@ in modules // { }; }; + aiohttp = buildPythonPackage rec { + name = "aiohttp-${version}"; + version = "0.19.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/aiohttp/${name}.tar.gz"; + sha256 = "9bfb173baec179431a1c8f3566185e8ebbd1517cf4450217087d79e26e44c287"; + }; + + disabled = pythonOlder "3.4"; + + doCheck = false; # Too many tests fail. + + buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; + propagatedBuildInputs = with self; [ chardet ]; + + meta = { + description = "http client/server for asyncio"; + license = with licenses; [ asl20 ]; + homepage = https://github.com/KeepSafe/aiohttp/; + }; + }; + alabaster = buildPythonPackage rec { name = "alabaster-0.7.3"; From 873096ab7aebc7dc47e8c844f2bf483b6e8947b0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 13:43:29 +0100 Subject: [PATCH 257/498] all-packages: Fix typo in "pythonpackages". Regression introduced by 515a13b1f50fad34482457c616e6c5d090c2da3c. All lower-case won't evaluate very well. Signed-off-by: aszlig --- 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 cc40cbd5e9f..8db2f845f65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9053,7 +9053,7 @@ let pysideTools = pythonPackages.pysideTools; - pysideShiboken = pythonpackages.pysideShiboken; + pysideShiboken = pythonPackages.pysideShiboken; pyxml = callPackage ../development/python-modules/pyxml { }; From 9678f78056c93fa835459593ef7b4756b090f8bc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 09:37:33 -0600 Subject: [PATCH 258/498] plasma55.breeze-gtk: init at 5.5.0.1 The GTK themes do not depend on GTK at compile time, so they are also now included in plasma55.breeze at no cost. --- pkgs/desktops/plasma-5.5/breeze-gtk.nix | 8 ++++++++ pkgs/desktops/plasma-5.5/default.nix | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5.5/breeze-gtk.nix diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/plasma-5.5/breeze-gtk.nix new file mode 100644 index 00000000000..179f15dc876 --- /dev/null +++ b/pkgs/desktops/plasma-5.5/breeze-gtk.nix @@ -0,0 +1,8 @@ +{ plasmaPackage +, extra-cmake-modules +}: + +plasmaPackage { + name = "breeze-gtk"; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix index 33937aa3220..812c70c2b00 100644 --- a/pkgs/desktops/plasma-5.5/default.nix +++ b/pkgs/desktops/plasma-5.5/default.nix @@ -44,11 +44,12 @@ let addPackages = self: with self; { bluedevil = callPackage ./bluedevil.nix {}; + breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-qt4 = callPackage ./breeze-qt4.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze = let version = (builtins.parseDrvName breeze-qt5.name).version; - in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; + in symlinkJoin "breeze-${version}" [ breeze-gtk breeze-qt4 breeze-qt5 ]; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; kdecoration = callPackage ./kdecoration.nix {}; From e7d28ed48810431090d222ad46ec6839b6b79ef1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 09:45:15 -0600 Subject: [PATCH 259/498] kf516.breeze-icons: init at 5.16.0 --- .../libraries/kde-frameworks-5.16/breeze-icons.nix | 8 ++++++++ .../development/libraries/kde-frameworks-5.16/default.nix | 1 + 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix new file mode 100644 index 00000000000..8c86a46401d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix @@ -0,0 +1,8 @@ +{ kdeFramework +, extra-cmake-modules +}: + +kdeFramework { + name = "breeze-icons"; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/default.nix index 208a437c51e..6c2889aa598 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/default.nix @@ -40,6 +40,7 @@ let attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; + breeze-icons = callPackage ./breeze-icons.nix {}; extra-cmake-modules = callPackage ./extra-cmake-modules {}; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; From 521d9e50644b4bfca8877a23b999c7ca0764ad95 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 10:28:36 -0600 Subject: [PATCH 260/498] nixos/kde5: comment on Oxygen icons move --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index dc6aa137cbd..2bf2fc29622 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -108,6 +108,7 @@ in kdeApps.okular kdeApps.print-manager + # Oxygen icons moved to KDE Frameworks 5.16 and later. (kdeApps.oxygen-icons or kf5.oxygen-icons5) pkgs.hicolor_icon_theme From 9b7ae36087b1bc11ccef85d8f0433dc0f8ab5274 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 10:29:25 -0600 Subject: [PATCH 261/498] nixos/kde5: only install Orion if Breeze GTK unavailable --- nixos/modules/services/x11/desktop-managers/kde5.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2bf2fc29622..6f876c0597d 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -113,8 +113,11 @@ in pkgs.hicolor_icon_theme plasma5.kde-gtk-config - pkgs.orion # GTK theme, nearly identical to Breeze ] + + # Plasma 5.5 and later has a Breeze GTK theme. + # If it is not available, Orion is very similar to Breeze. + ++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa From 92a484bdf2c27d36173ab20b53f1a616e07bdd89 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 10:29:52 -0600 Subject: [PATCH 262/498] nixos/kde5: install Breeze icons if available --- nixos/modules/services/x11/desktop-managers/kde5.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 6f876c0597d..1b64e2c38e0 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -118,6 +118,9 @@ in # Plasma 5.5 and later has a Breeze GTK theme. # If it is not available, Orion is very similar to Breeze. ++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion + + # Install Breeze icons if available + ++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa From 8a1682ce3fa88ace014d2cbfbcc3e080f4dfc886 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 10:30:09 -0600 Subject: [PATCH 263/498] nixos/kde5: reformat Phonon backend package list --- nixos/modules/services/x11/desktop-managers/kde5.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 1b64e2c38e0..a41af72d37b 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -121,10 +121,13 @@ in # Install Breeze icons if available ++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons + + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa ++ lib.optional config.powerManagement.enable plasma5.powerdevil + ++ lib.optionals cfg.phonon.gstreamer.enable [ pkgs.phonon_backend_gstreamer @@ -142,6 +145,7 @@ in pkgs.gst_all_1.gst-plugins-bad pkgs.gst_all_1.gst-libav # for mp3 playback ] + ++ lib.optionals cfg.phonon.vlc.enable [ pkgs.phonon_qt5_backend_vlc From 34f2addf11e8f210f151c75a40e367558c89e346 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 10 Dec 2015 10:31:09 -0600 Subject: [PATCH 264/498] nixos: add sddm test to combined constituents --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4dc221dba68..9a2a77b3155 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -83,6 +83,7 @@ in rec { (all nixos.tests.openssh) (all nixos.tests.printing) (all nixos.tests.proxy) + (all nixos.tests.sddm) (all nixos.tests.simple) (all nixos.tests.udisks2) (all nixos.tests.xfce) From 78a6d62b4894089fe58c1706cda7c2b801294728 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 06:58:04 -0600 Subject: [PATCH 265/498] sddm: wrap to include themes --- .../services/x11/display-managers/sddm.nix | 15 ++- .../display-managers/sddm/default.nix | 112 +++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 85 insertions(+), 46 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 5ca3a44324f..d156f692f26 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,6 +9,8 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services."display-manager".environment; + sddm = pkgs.sddm.override { inherit (cfg) themes; }; + xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} @@ -22,6 +24,8 @@ let [Theme] Current=${cfg.theme} + ThemeDir=${sddm}/share/sddm/themes + FacesDir=${sddm}/share/sddm/faces [Users] MaximumUid=${toString config.ids.uids.nixbld} @@ -86,6 +90,14 @@ in ''; }; + themes = mkOption { + type = types.listOf types.package; + default = []; + description = '' + Extra packages providing themes. + ''; + }; + autoLogin = mkOption { default = {}; description = '' @@ -146,8 +158,7 @@ in services.xserver.displayManager.job = { logsXsession = true; - #execCmd = "${pkgs.sddm}/bin/sddm"; - execCmd = "exec ${pkgs.sddm}/bin/sddm"; + execCmd = "exec ${sddm}/bin/sddm"; }; security.pam.services = { diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index dc891605d1b..8e517486925 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,54 +1,80 @@ -{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: +{ stdenv, makeQtWrapper, fetchFromGitHub +, cmake, pkgconfig, libxcb, libpthreadstubs, lndir +, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd +, themes +}: let version = "0.13.0"; + + unwrapped = stdenv.mkDerivation rec { + name = "sddm-unwrapped-${version}"; + + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${version}"; + sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; + }; + + patches = [ + ./0001-ignore-config-mtime.patch + ./0002-fix-ConfigReader-QStringList-corruption.patch + ]; + + nativeBuildInputs = [ cmake pkgconfig qttools ]; + + buildInputs = [ + libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd + ]; + + cmakeFlags = [ + "-DCONFIG_FILE=/etc/sddm.conf" + # Set UID_MIN and UID_MAX so that the build script won't try + # to read them from /etc/login.defs (fails in chroot). + # The values come from NixOS; they may not be appropriate + # for running SDDM outside NixOS, but that configuration is + # not supported anyway. + "-DUID_MIN=1000" + "-DUID_MAX=29999" + ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QML based X11 display manager"; + homepage = https://github.com/sddm/sddm; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; + }; + in -stdenv.mkDerivation rec { + +stdenv.mkDerivation { name = "sddm-${version}"; + phases = "installPhase"; - src = fetchFromGitHub { - owner = "sddm"; - repo = "sddm"; - rev = "v${version}"; - sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; - }; + nativeBuildInputs = [ lndir makeQtWrapper ]; + buildInputs = [ unwrapped ] ++ themes; + inherit themes; + inherit unwrapped; - patches = [ - ./0001-ignore-config-mtime.patch - ./0002-fix-ConfigReader-QStringList-corruption.patch - ]; + installPhase = '' + makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" - nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ]; - - buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; - - cmakeFlags = [ - "-DCONFIG_FILE=/etc/sddm.conf" - # Set UID_MIN and UID_MAX so that the build script won't try - # to read them from /etc/login.defs (fails in chroot). - # The values come from NixOS; they may not be appropriate - # for running SDDM outside NixOS, but that configuration is - # not supported anyway. - "-DUID_MIN=1000" - "-DUID_MAX=29999" - ]; - - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + mkdir -p "$out/share/sddm" + for pkg in $unwrapped $themes; do + local sddmDir="$pkg/share/sddm" + if [[ -d "$sddmDir" ]]; then + lndir -silent "$sddmDir" "$out/share/sddm" + fi + done ''; - postInstall = '' - wrapQtProgram $out/bin/sddm - wrapQtProgram $out/bin/sddm-greeter - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; + inherit (unwrapped) meta; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a88ed84b3fc..71de31257e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13115,7 +13115,9 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = qt5Libs.callPackage ../applications/display-managers/sddm { }; + sddm = qt5Libs.callPackage ../applications/display-managers/sddm { + themes = []; # extra themes, etc. + }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; From 8f26ac9f4750d9918a095b2504ee702bf208fb8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 06:58:19 -0600 Subject: [PATCH 266/498] sddm: add ttuegel as maintainer --- pkgs/applications/display-managers/sddm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 8e517486925..d2faf465106 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -49,7 +49,7 @@ let description = "QML based X11 display manager"; homepage = https://github.com/sddm/sddm; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ttuegel ]; }; }; From b858a32d277628746316b4ed9695b087e177ef75 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 06:58:28 -0600 Subject: [PATCH 267/498] nixos/kde5: enable Breeze SDDM theme --- nixos/modules/services/x11/desktop-managers/kde5.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index a41af72d37b..0f3cb5735e7 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -177,6 +177,14 @@ in # Extra UDEV rules used by Solid services.udev.packages = [ pkgs.media-player-info ]; + services.xserver.displayManager.sddm = { + theme = "breeze"; + themes = [ + plasma5.plasma-workspace + (kdeApps.oxygen-icons or kf5.oxygen-icons5) + ]; + }; + security.pam.services.kde = { allowNullPassword = true; }; }; From 899c554f65ee60a39dbb93ed7d7eb9372dff6d14 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 07:08:07 -0600 Subject: [PATCH 268/498] nixos/tests: test SDDM with KDE 5 enabled --- nixos/release.nix | 1 + nixos/tests/sddm-kde5.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 nixos/tests/sddm-kde5.nix diff --git a/nixos/release.nix b/nixos/release.nix index bf0dc2379b5..b5ac97b3b94 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -287,6 +287,7 @@ in rec { tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.sddm = callTest tests/sddm.nix {}; + tests.sddm-kde5 = callTest tests/sddm-kde5.nix {}; tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/sddm-kde5.nix b/nixos/tests/sddm-kde5.nix new file mode 100644 index 00000000000..476cb732e25 --- /dev/null +++ b/nixos/tests/sddm-kde5.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "sddm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ttuegel ]; + }; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + services.xserver.desktopManager.kde5.enable = true; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + startAll; + $machine->waitForWindow("^IceWM "); + ''; +}) From b0bb9cd5fec88147cf4e885822da1ff5c9e0cf53 Mon Sep 17 00:00:00 2001 From: Roel van Dijk Date: Fri, 11 Dec 2015 14:35:04 +0100 Subject: [PATCH 269/498] fontmatrix: init at 0.6.0 --- .../graphics/fontmatrix/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/graphics/fontmatrix/default.nix diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix new file mode 100644 index 00000000000..84986e0d900 --- /dev/null +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "fontmatrix-0.6.0"; + src = fetchurl { + url = "http://fontmatrix.be/archives/${name}-Source.tar.gz"; + sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c"; + }; + + buildInputs = [ qt4 ]; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; + homepage = http://fontmatrix.be/; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 720538de89f..84cf2ed6aef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1511,6 +1511,8 @@ let withGTK = true; }; + fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty {}; From 3f8ca3c676a4480150aedd3c4440a69369a90dec Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 10 Dec 2015 12:05:39 +0100 Subject: [PATCH 270/498] rofi-pass: Add missing dependencies. --- pkgs/tools/security/pass/rofi-pass.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 98ef14cb578..94dca5dca68 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, pass, rofi, coreutils, utillinux, xdotool, gnugrep +, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils , makeWrapper }: stdenv.mkDerivation rec { @@ -26,11 +26,13 @@ stdenv.mkDerivation rec { wrapperPath = with stdenv.lib; makeSearchPath "bin/" [ coreutils - utillinux - rofi - pass - xdotool + findutils gnugrep + pass + pwgen + rofi + utillinux + xdotool ]; fixupPhase = '' From 01a49270a8cf1344fa5df17230ef3d3da814db3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 11 Dec 2015 17:24:31 +0300 Subject: [PATCH 271/498] playonlinux: attempt to fix Hydra failure --- pkgs/applications/misc/playonlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 65a703d8c89..c79d9c037d1 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -42,7 +42,7 @@ let ld32 = if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else abort "Unsupported platform for PlayOnLinux"; + else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; @@ -95,6 +95,6 @@ in stdenv.mkDerivation { homepage = https://www.playonlinux.com/; license = licenses.gpl3; maintainers = [ maintainers.a1russell ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } From 392fcb14cfac24b7026043e09e03398fce7a7557 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 11 Dec 2015 14:30:21 +0000 Subject: [PATCH 272/498] pythonPackages.netcdf4: 1.1.8 -> 1.2.1 --- pkgs/top-level/python-packages.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84da0312e3..a2b3a37ce31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5266,13 +5266,13 @@ in modules // { netcdf4 = buildPythonPackage rec { name = "netCDF4-${version}"; - version = "1.1.8"; + version = "1.2.1"; disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/netCDF4/${name}.tar.gz"; - sha256 = "0y6s8g82rbij0brh9hz3aapyyq6apj8fpmhhlyibz1354as7rjq1"; + sha256 = "0wzg73zyjjhns4209vrcvh71gs392d16ynz76x3pl1xg2by723iy"; }; propagatedBuildInputs = with self ; [ @@ -5284,13 +5284,12 @@ in modules // { pkgs.libjpeg ]; - patchPhase = '' - export USE_NCCONFIG=0 - export HDF5_DIR="${pkgs.hdf5}" - export NETCDF4_DIR="${pkgs.netcdf}" - export CURL_DIR="${pkgs.curl}" - export JPEG_DIR="${pkgs.libjpeg}" - ''; + # Variables used to configure the build process + USE_NCCONFIG="0"; + HDF5_DIR="${pkgs.hdf5}"; + NETCDF4_DIR="${pkgs.netcdf}"; + CURL_DIR="${pkgs.curl}"; + JPEG_DIR="${pkgs.libjpeg}"; meta = { description = "interface to netCDF library (versions 3 and 4)"; From 577df36b56894a130c764933c1940c168938693c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 09:04:18 -0600 Subject: [PATCH 273/498] phonon_qt5_backend_gstreamer: fix build with gstreamer-1.6.1 An include flag which should be picked up through pkgconfig is not. The root cause is unknown, but it's simple to add the missing flag to NIX_CFLAGS_COMPILE. --- .../libraries/phonon-backend-gstreamer/qt5/old.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix index bc34d249b46..d91808ec880 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix @@ -15,7 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; + buildInputs = with gst_all_1; [ + gstreamer gst-plugins-base phonon_qt5 qt5.base + ]; + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; nativeBuildInputs = [ cmake pkgconfig ]; From cc64f51baa8f619500adb255fa40bf386faf4374 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 09:05:16 -0600 Subject: [PATCH 274/498] qt5Libs.phonon_backend_gstreamer: fix build with gstreamer-1.6.1 An include flag which should be picked up through pkgconfig is not. The root cause is unknown, but it's simple to add the missing flag to NIX_CFLAGS_COMPILE. --- .../libraries/phonon-backend-gstreamer/qt5/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 2c6e40eaf73..9866c0a67ce 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = [ From 3ade7b690eb597f68e60ece03e650dbfc2aa4626 Mon Sep 17 00:00:00 2001 From: leenaars Date: Fri, 11 Dec 2015 18:00:49 +0100 Subject: [PATCH 275/498] opendkim: 2.4.3 > 2.10.3 Added some metadata as well. --- pkgs/development/libraries/opendkim/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 5dfd87c4d84..d84f9e75510 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,13 +1,21 @@ -{stdenv, fetchurl, openssl, libmilter}: +{stdenv, fetchurl, openssl, libmilter, libbsd}: stdenv.mkDerivation rec { - name = "opendkim-2.4.3"; + name = "opendkim-2.10.3"; src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; - sha256 = "01h97h012gcp8rimjbc9mrv4759cnw4flb42ddiady1bmb2p7vy3"; + sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; - buildInputs = [openssl libmilter]; + buildInputs = [openssl libmilter libbsd]; + + meta = { + description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; + homepage = http://opendkim.org/; + maintainers = [ ]; + platforms = with stdenv.lib.platforms; all; + }; + } From a7fe3c667fd60cdfe94a5b694961e53ad6050c7e Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 11 Dec 2015 21:31:40 +0300 Subject: [PATCH 276/498] vimPlugins: update to 11.12.2015 --- pkgs/misc/vim-plugins/default.nix | 373 ++++++++++++++++-------------- 1 file changed, 198 insertions(+), 175 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index fe393753f24..30c4c7d63b1 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -110,22 +110,22 @@ rec { }; Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-08-13"; + name = "Gist-2015-10-25"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "ea7dc962c5c2ac2a1c4adc94d54cac190d713648"; - sha256 = "0b96a572018de25120fe91eea17b8ee2844881c88ab63e03d999c22fc292f11e"; + rev = "88c331e2e07765090112a396e5e119b39b5aa754"; + sha256 = "0da7e356b4a50921c1a67edcf066785ed637750094f42ac1bc61ae82a2f7f9c5"; }; dependencies = []; }; Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2013-11-26"; + name = "Hoogle-2015-11-27"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + rev = "f0deb22baad592329b158217143f8b324548b4bd"; + sha256 = "e98b9b729b8c7dfcf34ccd36940e4d855975580864cf36f5e4bb88336fd1e263"; }; dependencies = []; @@ -154,11 +154,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-10-02"; + name = "Syntastic-2015-12-10"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "7e26d3589ab414155dff2c362a07e9e8bb970823"; - sha256 = "3878a0d2664eac37c033985d725c8606bb6c1796cf94d36ffe85197bf1df8b24"; + rev = "48736aa376341518d7bedf3a39daf0ae9e1dcdc0"; + sha256 = "2a523c7d54b5afee1eda6073c71ffcea7ba60e5240d91ea235f007ad89fb8e55"; }; dependencies = []; @@ -187,33 +187,33 @@ rec { }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2015-07-26"; + name = "The_NERD_Commenter-2015-10-29"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "5cc672a4f2adb734ac671499476034f0cd1d3d72"; - sha256 = "a8ab1f90044bf96e9c105c4a3ff6bbd9aaa20bddbaca1d82d7ca15d2cc3c2654"; + rev = "1f4bfd59920c101a30a74a07b824608a6e65f3fe"; + sha256 = "4ef10aafc54bcb3e119cac7f4b0065d8dc09d43d92dc069a499e96e935afb83d"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-09-18"; + name = "The_NERD_tree-2015-12-02"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "0b44415a3302030b56755cc1135ca9ca57dc1ada"; - sha256 = "7841683821e41b65e4aff9222639a43f05d7b24c874b309f1cc3e6407e09343f"; + rev = "4ebbb533c3faf2c480211db2b547972bb3b60f2b"; + sha256 = "f730aa7347d6e710451514137985265338f8f60c4ab7f98e2a0eed65071e08ed"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-09-20"; + name = "UltiSnips-2015-12-09"; src = fetchgit { - url = "git://github.com/sirver/ultisnips"; - rev = "e1e005a810edc7b1c13b5095fe3ab7ce2600b0cb"; - sha256 = "de2fd5d654fc48021325f5373ca5be741d105a191ba47ad1c5333046a615b745"; + url = "git://github.com/SirVer/ultisnips"; + rev = "5a2dcc5cbfa4c1e4a981d57544eb51fc5baeecea"; + sha256 = "dd9b087b7a08b75a60f104cf734b604f8823a219b76531694b4957fce6a2a8d5"; }; dependencies = []; @@ -231,11 +231,11 @@ rec { }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2015-09-14"; + name = "WebAPI-2015-10-05"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "575859ae34175a3bb88371dd65b266d7e8044140"; - sha256 = "bee247bd833db32386313b8966ba7ae36623606c3e3712d4660de671b626b958"; + rev = "dfc60635e610f9200646a84d11887af9e3d50b10"; + sha256 = "7bc85fe344854e02377f4ac931a015ef1ffd6de14f1d0d8fca04785beabe584b"; }; dependencies = []; @@ -280,11 +280,11 @@ rec { }; ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2013-05-08"; + name = "ctrlp-z-2015-10-17"; src = fetchgit { url = "git://github.com/amiorin/ctrlp-z"; - rev = "7845735a3d63a68ed63aa3a5363b178c48f199bf"; - sha256 = "14c5240e6ab373cbd04d105a46808aed4a324472ddfd67b993534bf5d726e93f"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "d40ba49edba53805779706633ec3ee0056dd88835cc6b2e88fbe628a5e90da9a"; }; dependencies = []; @@ -302,22 +302,22 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-10-02"; + name = "fugitive-2015-12-01"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "0b43b51d7785aeb4002b45ca49cea5aef0d2e988"; - sha256 = "8b6002169ec54487951680c67e618b2bfdf04cc0d430eb1149917f82277fc20f"; + rev = "d854197c03c0b027cca41abf86a5557c5473b82f"; + sha256 = "cbe8333d1d359c5ba556d8f59e6700d14c0425a3b333503e3411e48b4b239cda"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-09-17"; + name = "ghcmod-2015-12-10"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "3e012a5b0b904c5c32eeea39071534d492a64a0f"; - sha256 = "e35c4528d08efb85c68fd4faa19283d67f936d915cae780de0cae0cc53131500"; + rev = "1cab59653ef0fba71574c7f64e60a27df2bc38fc"; + sha256 = "34556e0d4d7059fb6842eabfc4e9d0065e69b0e45b54e224b684e562f2917556"; }; dependencies = []; @@ -335,11 +335,11 @@ rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2015-05-10"; + name = "vim-nix-2015-12-10"; src = fetchgit { url = "git://github.com/LnL7/vim-nix"; - rev = "39f5eb681f2ed2282ed562af2d6a2e40712d8429"; - sha256 = "6f109b6949f773b2d7f06adeb45334fa61479c95750666b450265851cb24c761"; + rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12"; + sha256 = "52dbdd4d5bc12988eb62d9022109dbd8b1c5716c27753ce187db6c2fb6737664"; }; dependencies = []; @@ -357,11 +357,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2015-09-29"; + name = "neomake-2015-12-05"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "dc65a7a5d85670c84fc0055d19fa6901ae96ef93"; - sha256 = "967559156af1f06e345c04a4df9e3ab6a0e913e56ff2a66189a91a5c57c4f668"; + rev = "73f186e069d432b7746c1c09ac085c68d6e120f8"; + sha256 = "e6bbe895e373a3b596291e0420d856928cd874485c4c2f5b7c2972738696464b"; }; dependencies = []; @@ -379,44 +379,44 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2015-05-29"; + name = "vim-tmux-navigator-2015-12-05"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "176452ead44118174ddad3502709a247d9c24bb4"; - sha256 = "789c8b24b971a3b307ac296234230f1048ff2928c89302700bd4e5fc2edd2d8a"; + rev = "1298b71c420f1d0abceba3f35cc710131f84d73b"; + sha256 = "bde962fe1441cd6f030d9704e6e71117fb43d827b8952d3e1d44009c297b4eb5"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2015-09-15"; + name = "ctrlp-vim-2015-11-30"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "58247bdf8550879e183c13860eefa03983959e4a"; - sha256 = "1d4cf293a1e48564a491e00077794e23f5360827a72c2618fd3e99ee153ea6a8"; + rev = "7a80267ed061f3dc30bb319f438bdadfd8c7b1fd"; + sha256 = "ae29eb79ca32ca0edd32602cf6b1e1276ccd4f5086ac4297a7f0dea2dd2e1f1b"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2015-07-06"; + name = "vim-jade-2015-11-23"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "fb47bb8303e81fc17b4340ccd01a462332f7d90a"; - sha256 = "c3dde95c01d9e174a9143103e76796d2da40ddb68de9f321fce3f88df312e15a"; + rev = "f760e239386df055eb1892243624fdf7f7c58392"; + sha256 = "812e65090e6a1c31f433878fd1012673a8244d8b6974b1c2ffd1558c30c716cc"; }; dependencies = []; }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-10-03"; + name = "neco-ghc-2015-11-20"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "0550fea80e9c958a479067805bcf98e294bb2e32"; - sha256 = "061fadcae3122f4d2bb86e0a238f8980884080427bbc3f0fe7e2e9c9efe6c5eb"; + rev = "53a3d63bc4ecc10d8506a40a0472987f262050da"; + sha256 = "85ff5e1564a7fd81bbfcec1f4d16e675c2dd1fba38223dbae134f665f03985a8"; }; dependencies = []; @@ -434,22 +434,33 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2015-10-03"; + name = "vim-go-2015-12-08"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "1792ee374ba8d384cd547506cbf8f43690d1d55f"; - sha256 = "cbcac7b9ee8fccf89fc7b5adfb9a7ca7cda2e15447093a9fc886c2fd5b0063e0"; + rev = "0aeb07e9305f5696bfc1cffb1e3b2226d851b913"; + sha256 = "6bd784ef49f68526b26b25149f153b2caafa5840690ee65452b9ee6d0e99814e"; + }; + dependencies = []; + + }; + + vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-colorschemes-2015-07-25"; + src = fetchgit { + url = "git://github.com/flazz/vim-colorschemes"; + rev = "28a989b28457e38df620e4c7ab23e224aff70efe"; + sha256 = "5308c874a34dc03256ece2e54ab7b92c8384ebb4137436582fd4aa6c38ad36e5"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2015-08-14"; + name = "idris-vim-2015-12-08"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "45680a3c412f2cc8d40aff512e5e9ace44002922"; - sha256 = "e053a37cb14228a49be265c5fa1af96d3bae1a5a5ceffdd21e3c4547a79656b1"; + rev = "1f9bad6bc1d05b44e7555fe80472fbb7a542f47a"; + sha256 = "50cfb5a58a6c203c5f3695de61e9bc743e5dca71427e00c5cae86b4409debd3c"; }; dependencies = []; @@ -532,6 +543,17 @@ rec { }; + vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-colorstepper-2015-08-04"; + src = fetchgit { + url = "git://github.com/jonbri/vim-colorstepper"; + rev = "5783c2567a193e7604780353d6f8ce445b2ab191"; + sha256 = "a9ab0c724a827eba9c74d93dda118863656d27df7d5d26b971e0ac71c87f7e59"; + }; + dependencies = []; + + }; + vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-xdebug-2012-08-15"; src = fetchgit { @@ -566,11 +588,11 @@ rec { }; vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eighties-2015-06-15"; + name = "vim-eighties-2015-11-02"; src = fetchgit { url = "git://github.com/justincampbell/vim-eighties"; - rev = "68dc644664bf569e96ac91f79fdf828e89d70e02"; - sha256 = "d6600665179395141d660c65dad3e03c13aeba164a6c1e6fabfc9e2499588132"; + rev = "62a9719df45fddd0456bf47420fc4768f9c8f5a5"; + sha256 = "b3386d1c40650e5c0ebda2105d1404cfb2aab74153e13bace4a73bc667d91e81"; }; dependencies = []; @@ -599,22 +621,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2015-10-04"; + name = "vimtex-2015-12-11"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "db92be5756239c31eed521f2131eac3ca997c0cc"; - sha256 = "67597a04c0c92199d0499607982a202247ef879768445eb0c7a21d27357845fc"; + rev = "62d0b9b44c53eb2302a50ad6f7a8446ab10e233c"; + sha256 = "b847f22a40e605c05a5e7672562e2e58b0effd5615c1e199937a920002ff4634"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2015-08-06"; + name = "vim-easymotion-2015-10-27"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "0806257ca6432ac7beb75c4319dadf7f3ba9907b"; - sha256 = "529f836da3a546c507ec99f7c827902a75472fefe570a93258360bfa4c253909"; + rev = "a21d4474f0e9df7a721246e0a3b386068901965f"; + sha256 = "96bb705e9ff626b139a7f92906468eda63d743b8457a1dc1e4de9c3cf9486525"; }; dependencies = []; @@ -636,11 +658,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2015-08-20"; + name = "vim-startify-2015-12-11"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "6f886cdc48cf34c50eb723abca2f813a5de2c11b"; - sha256 = "2614bee6a0cdb1a80aa6d3cfeba9e7521ac0be21d15ca4512a413cf192d93fd8"; + rev = "295fe7a09a881448eea1aa71d26f53dcda3c499b"; + sha256 = "a561488ae8870364f822a93ef18d35511b4dd7e779fd18e365851e8d216df61e"; }; dependencies = []; @@ -691,11 +713,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-09-18"; + name = "racer-2015-12-11"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "b9750c373adf75fc28700bce382761ad85a8a2bd"; - sha256 = "a2f2ca5106a0c30ee8e724291559f0f26729ede545ac7b9be3ee973face24444"; + rev = "ce1915a6fd76f76433f30cfaf1fe1b2a8e21cdd4"; + sha256 = "24d48cbf6d69e397cd7a9925c42e2a10fb8c9dc4a0ef8b9122894847224fd735"; }; dependencies = []; buildPhase = '' @@ -705,55 +727,55 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2015-10-03"; + name = "neocomplete-vim-2015-12-11"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "d2a78075207b97c105041927a125e2cf0b2b0ca5"; - sha256 = "6a64c6bd90a53f7f3636177cb1c507229d51b7dbb6a5dde8f3c4aad4cbe176d7"; + rev = "1c8d6356ad562e7430f091950530925f0a9dad5f"; + sha256 = "148d61fff5e07547a09e41f9105fa3a4bbecf82089855cab8d5b26cccddec0f5"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2015-09-07"; + name = "neosnippet-snippets-2015-12-05"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "7bc1674170670a4c43f7f4fc65e0e396759512ea"; - sha256 = "87a0c603517ab740b774245ca224235ff03abd1480855f4c2bedccd9acb95d53"; + rev = "42e81d1409fd08a3acec8c82c8480880338e4808"; + sha256 = "fb8aca8264851bceecf06d483162a55897f8ecdbe873fbc383d5a05cd0a50e1f"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2015-10-03"; + name = "neosnippet-vim-2015-12-12"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "7c07c4d8a2228c77ae4d519c936811db662ecd4a"; - sha256 = "c967ad2b7a70bfa273e9a802b3b6603f85bcb5dcdae8749019ce43de7dfde85c"; + rev = "7dc7ce803e28783bcbb829bfdbe8bbae6e51139a"; + sha256 = "bddcd3e651fbd96cb740fec67782439f3d899715e564b539e6e19eef34750d56"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2015-10-02"; + name = "unite-vim-2015-12-05"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "c57bed02229a80d050c2411dff5f0943e6edf08a"; - sha256 = "3486c584a023b31257e3c67ad86557d62577aa9a5ee19b79736844f1a114179f"; + rev = "f376de838a46c4848a81a2e95ebc4116732b1fef"; + sha256 = "372c353040b3e79dd6c223e0ead442090e4257daabd0d002e733d9cb691c778c"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-10-03"; + name = "vimproc-vim-2015-12-11"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "3134f1258de30a4eb7a3b1aeee90628a7f0c3a2a"; - sha256 = "8993f0ac8d768f3e99fa05fca61434eeb5dc34b337db42b0524f60827be41b79"; + rev = "f96e476e41ab4cdb9c37242c8cf76f1e5aa5b91d"; + sha256 = "da5de329b567d72fec8dc49d13006f19eca09282c57304dfa8d22bfbf8a9ace4"; }; dependencies = []; buildInputs = [ which ]; @@ -768,21 +790,21 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2015-08-28"; + name = "vimshell-vim-2015-11-24"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "a1f9a2010bea4b109341f1e2411a32839a8547b3"; - sha256 = "bd2419b50b981e62e25afaa9c5206b818098cd7663cac8566f1d654fbea56ca6"; + rev = "7931e3bf9fbba738b26bb76143dfc1df17f7a99b"; + sha256 = "f51ee4e8b16460226ce74d87236834f13008dca16dbc9090d89576a545f573bc"; }; dependencies = [ "vimproc-vim" ]; }; gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gundo-vim-2013-07-10"; + name = "gundo-vim-2015-12-07"; src = fetchgit { url = "git://github.com/sjl/gundo.vim"; - rev = "3975ac871565115e3769dc69c06bc88ddc1369af"; - sha256 = "f66ed79d88171a4d57ee64eaf21035291518d8c64b607bd420c3ee85fa14afe5"; + rev = "dd5ab1e930deb8c74ea9046654dd0587df0cf459"; + sha256 = "6fe21b7398d8eb9b18f2015f64b7d40768123c2dbbde829d654d3dbf1ffb8070"; }; dependencies = []; @@ -800,22 +822,22 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2015-10-02"; + name = "vim-quickrun-2015-11-14"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "9fff9e5f12fcea45637821e30e6dbee05e748854"; - sha256 = "ca7376c6eafc1397c0a92c2ace7141daeeb881aaeabdc3168d4a0b598fd25caa"; + rev = "5bcb966b80d9d9e4051d9882a07fd61a2ea39d23"; + sha256 = "894a0f5c569ddd633514084e8021322b2fe62889fa8d32b2211d7bab04a701f2"; }; dependencies = []; }; molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "molokai-2014-04-11"; + name = "molokai-2015-11-11"; src = fetchgit { url = "git://github.com/tomasr/molokai"; - rev = "db8ce13b3737d3ddea8368498183d7c204a762eb"; - sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a"; + rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; + sha256 = "3a0cd4eef9b4e3a4fd826c66a8edec44a087d04f500217981a84fb59b2fc3ade"; }; dependencies = []; @@ -855,11 +877,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-09-25"; + name = "youcompleteme-2015-12-11"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "5a186275a581b04bbdb7001475d946e30d0f80b4"; - sha256 = "6794aaa55ad55db1972260fe02099c8c05961c5ac9151776c88a2cdf3fcd92fd"; + rev = "14083d939d4b1341dc6ad2053914c327b7d647b1"; + sha256 = "ec900cb1fabfb1690ae735a46375e1f5044f70df5fd34e2ea233e9b4f558e342"; }; dependencies = []; buildInputs = [ @@ -901,22 +923,22 @@ rec { }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2015-08-13"; + name = "vim-pandoc-2015-10-20"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "ead1f177b2c894d60e01d3f16227e2e6e06c85a7"; - sha256 = "44fa5d236f7ae2e98bd3e1575b79265be812b4a49488d001f9f37e9b2b8cd3f8"; + rev = "7d7fdeabb83808f669f4cab37d7950b1bed8adbe"; + sha256 = "451e520ca62cf1207da0f22c2c23f4502f81c0b5a662cd9bfb898e1f53301c41"; }; dependencies = []; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2015-09-25"; + name = "vim-pandoc-syntax-2015-11-05"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "dd71d6fc53e22e2bc84790e0b60f9827957e1ea7"; - sha256 = "60787f9ced453f335c0fe02f3e727bc9d4f4ab2e40a42a881b3b6f3b20798e37"; + rev = "40c65141bc8c771f270ce8251a99ccdda1ab102c"; + sha256 = "c1be96f358b211d8a5126fdb541a6500c9016e829527d57766b1ec18a4d8ad0e"; }; dependencies = []; @@ -1000,11 +1022,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2015-10-01"; + name = "vim-wakatime-2015-12-01"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "9fd813c489958f98f5e8b215ab8b91b47f86fb5a"; - sha256 = "d55ee76845eda96d1864f73d6927f8c20a2df21bd25dae03ede732d2610d9a32"; + rev = "2b758403d8637cacbab1de603258c611408b9fa7"; + sha256 = "e3a3da2dd40c4098b18815ca12d83ad1789f5342a8d822669a29e9900600e6ff"; }; dependencies = []; buildInputs = [ python ]; @@ -1028,11 +1050,11 @@ rec { }; goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2015-08-08"; + name = "goyo-2015-11-15"; src = fetchgit { url = "git://github.com/junegunn/goyo.vim"; - rev = "c1293a91a3a04bcb82421b2ee711c49f83a418ae"; - sha256 = "258b23f4f043569e6e0458c8035d5b00be6031b02e460136f7783da1bbadcc49"; + rev = "630f5d80861beb36ae2dfa0c587ec6b51982cff5"; + sha256 = "28e74ab067ce55d0dd964b5214601e851046149ccf98b377861c56225f36dc44"; }; dependencies = []; @@ -1127,11 +1149,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-09-18"; + name = "snipmate-2015-10-27"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "e2d294b3962acbe7d8333bade2ebdb0ccde06740"; - sha256 = "856149bc5121845e3f3cd24f74d59e9af722a6ebdc0e050a90639704bfe14ee9"; + rev = "7f91de39088138491e40a35a855adb70677b02d3"; + sha256 = "e8c70bbad496fc1306814fbb078736a93d4f418d16f7692f4e37dbcc00ec6633"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1160,11 +1182,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2015-06-05"; + name = "table-mode-2015-12-03"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "5395c9f52b91ae6083fd7b26577b8f926da6871e"; - sha256 = "784e51f7144790fcfad83c2dc5c7f250608826ce48706b80c41f88fa04914ae2"; + rev = "2ab64777a5b81e240810999eb6e7dc65e1de5461"; + sha256 = "64aff63c0aeb696f087cf41021867e1576e4fe8d392d36ec2ca46ddec104a8e1"; }; dependencies = []; @@ -1192,22 +1214,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-08-05"; + name = "tlib-2015-12-11"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "4c128ee2fee6d97cc5c6089e7797b4ad536de2a4"; - sha256 = "9cd0fc23bb332d5ae939019929d989b636b891c894f350c38234eaf084e0656c"; + rev = "b957a0a6b7f7a1b0ffa370963712b4ef526b5f76"; + sha256 = "12168055ecafbbde4afafe7d5fce8046b21d62d748326a290b5dc4239b30db34"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2015-08-19"; + name = "undotree-2015-10-28"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "8ff701a5bdb8d382431eb042e4faf3320883b020"; - sha256 = "9c166cb812be486350a3e71eed273a630545d91e3198a214e3dce13b131aeb1d"; + rev = "74874d92d4bde3d026f2d0f3ff780b1787ba4e84"; + sha256 = "aa36bd56b1af88b55aac561ba7339944a28f8159c11f1058abb692eb9f99990d"; }; dependencies = []; @@ -1235,6 +1257,17 @@ rec { }; + vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-background-cmd-2015-12-11"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "06223ebaa157e17434cc09dae474324c105374e4e05d85695a05c7d0a2761c20"; + }; + dependencies = ["vim-addon-mw-utils"]; + + }; + vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-commenting-2013-06-10"; src = fetchgit { @@ -1356,6 +1389,17 @@ rec { }; + vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-signs-2013-04-19"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; + }; + dependencies = []; + + }; + vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-addon-sql-2014-01-18"; src = fetchgit { @@ -1401,11 +1445,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2015-10-05"; + name = "vim-airline-2015-10-18"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "543438e482763f64985a3fcab38a1936242a8087"; - sha256 = "2e21b2658a941fd15b8db59220b50b3090a44e8852b42d0538d7217f12cbc77c"; + rev = "14d14cf951c08fc88ca6c3e6f28fe47b99421e23"; + sha256 = "cfc686cad3749e3bd933b5ae3ea35c4a9c02765be9223e6b30e7d801a9174aa7"; }; dependencies = []; @@ -1423,11 +1467,11 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2015-10-01"; + name = "vim-easy-align-2015-10-09"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "0db4ea6132110631ec678a99a82aa49a0686ae65"; - sha256 = "c70440c3d0afdda630422819ca66ccf483035af86903d8725be5ca43a0940937"; + rev = "7cb559eb70600bbd81afbb2d7f60d98334f631e2"; + sha256 = "2ea40064f64a8a4f0f1e405ea5db5a3e79424cdec44d033c3d65cc40a2a19b18"; }; dependencies = []; @@ -1445,11 +1489,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-08-26"; + name = "vim-gitgutter-2015-12-10"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "1067294cdc379be1deb56074a093b49a8303308f"; - sha256 = "cb9f44e41fbf565eb07968270289bb4988a84f30f03d11f2919c0423c5ee278c"; + rev = "28aea43adf187ca01f0255c5a9418a5aac6380f1"; + sha256 = "74c6655373fd7d671e8599cd1996b962b12fc23fcc1c6437a9a09429509f3efb"; }; dependencies = []; @@ -1478,55 +1522,55 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2015-08-27"; + name = "vim-multiple-cursors-2015-10-30"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "146fe47ee6b2faf90d6dc1232ef1858883d798bb"; - sha256 = "916659142dc0abb3a390b56b6ec3c69e489cbbab582e09af8b9aae5b9a792727"; + rev = "73a78c926ad208bd1984e575ceece276d61a1404"; + sha256 = "74f51c7c6a903621ee3fc5e78fbce4853b5da086463d015c652808d155cbc7e6"; }; dependencies = []; }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2015-07-08"; + name = "vim-signature-2015-11-11"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "0a31fb0c4c62705b4b894e150330857170080b96"; - sha256 = "945cc02d15bf7e71a87d6b1ec0ae24e6f145bff0f76586f6d8f6bba38a303a4a"; + rev = "7cabfb5a3d3b45e739eb1d7e198782fb4a5a23da"; + sha256 = "18a8ab7ba9e74d2f65c64c0c316ef824e48f21196520dfd292522c1eb8c87cb3"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2015-08-13"; + name = "vim-signify-2015-12-09"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "d08f17873e3187da3f9998ddb81d81626ffb9ecf"; - sha256 = "7fffc5fbd21dd4f3ea81131ccb52d992d95a73be72288457b2ec3a0fa53ce3b2"; + rev = "ecb796139eb0fc9b79fdc28e9b610fa1a2c5f589"; + sha256 = "6086fb614a0da7f676f2f567b5dfc6ddd765167141f629dc8dbb02862e7db34c"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-10-05"; + name = "vim-snippets-2015-12-08"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "eb17eb104bf39812658db504cb9bd13106a17dee"; - sha256 = "8000dde268d95ddf504bbd54f4e03ec72cf8547b03966f0bdf46ca0becf1a684"; + rev = "c0040abe4e54786c77ec41d6dbd1be916a03a506"; + sha256 = "20b8a1e4ae563b5119d181d19538d540e4811cd20dd2509cc29940a01208bc7e"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2015-09-14"; + name = "vim-webdevicons-2015-12-01"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "fec56878c734b608c1fa79952579aa976da2c98b"; - sha256 = "ecbe3c62c06aaf0c7d3104210f95e95db529368fd58533360ea5041acb3bcdf1"; + rev = "0e1b7864cfee4b0585daa277bedd992f858e1e75"; + sha256 = "e265c6c0906d0427409a98458192a4eb94afe671f26fc8de8890dae0e66f7764"; }; dependencies = []; @@ -1544,46 +1588,25 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2014-02-21"; + name = "vimwiki-2015-12-10"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "2c03d82a0e4662adf1e347487d73a9bf4bf6fdac"; - sha256 = "8f94fe1204ae3770b114370382f9c616f971eb9b940d8d08ca96ac83405a0cdf"; + rev = "3bd3d9b86036b21aecd69f0a1e572643d626c280"; + sha256 = "7a10ae3881af0d17a041ffd766680ceedf706411abbbedccf64e9e777fabd5c8"; }; dependencies = []; }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2015-08-10"; + name = "vundle-2015-11-04"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "0ee36b26e127cda512a8f2852a59e5a5f374c87f"; - sha256 = "62fc2b756bd2a8bc9452c61de5babbb1f02de6e8122424a60862be61b8f80af1"; + rev = "5f70ae6025e951f0154e3940d123138adffa4c88"; + sha256 = "c063cabca479449a3330c14e879536473d4fdb0ca4b384c9c8be18c198a929fa"; }; dependencies = []; }; - vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2015-07-25"; - src = fetchgit { - url = "git://github.com/flazz/vim-colorschemes"; - rev = "28a989b28457e38df620e4c7ab23e224aff70efe"; - sha256 = "5308c874a34dc03256ece2e54ab7b92c8384ebb4137436582fd4aa6c38ad36e5"; - }; - dependencies = []; - - }; - - vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorstepper-2015-08-04"; - src = fetchgit { - url = "git://github.com/jonbri/vim-colorstepper"; - rev = "5783c2567a193e7604780353d6f8ce445b2ab191"; - sha256 = "a9ab0c724a827eba9c74d93dda118863656d27df7d5d26b971e0ac71c87f7e59"; - }; - dependencies = []; - - }; } From 941ef62cae0a84886b17fe7708d8097d3a78b5c6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 11 Dec 2015 19:45:07 +0100 Subject: [PATCH 277/498] bdf2psf: 1.132 -> 1.134 --- pkgs/tools/misc/bdf2psf/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 342c014faaa..192aed7489d 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.132"; + version = "1.134"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "01r8v6qi6klsgi66ld86c78cdz308mywrm9j101d73nsxgx6qhzz"; + sha256 = "1am5ka5qrbh60jjihzqac03ii3ydprvqm3w54dc55a0zwl61njsz"; }; buildInputs = [ dpkg ]; @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { cp -r . $out "; - meta = { + meta = with stdenv.lib; { description = "BDF to PSF converter"; homepage = https://packages.debian.org/sid/bdf2psf; longDescription = '' Font converter to generate console fonts from BDF source fonts ''; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; }; -} \ No newline at end of file +} From fdece0c2a49fd2d937420ff95fb05ed38e66d01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 11 Dec 2015 19:50:36 +0100 Subject: [PATCH 278/498] atom: 1.2.0 -> 1.3.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e3dc175b339..13e00754acd 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "05s3kvsz6pzh4gm22aaps1nccp76skfshdzlqwg0qn0ljz58sdqh"; + sha256 = "17q5vrvjsyxcd8favp0sldfvhcwr0ba6ws32df6iv2iyla5h94y1"; name = "${name}.deb"; }; From a6519d50c048ba67b946ad7f04dca3cb1f96a081 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 11 Dec 2015 19:51:28 +0100 Subject: [PATCH 279/498] calibre: 2.45.0 -> 2.46.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 950d7032882..a3ecef308eb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.45.0"; + version = "2.46.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1s3wrrvp2d0mczs09g2xkkknvlk3max6ws7awpss5kkdpjvay6ma"; + sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb"; }; inherit python; From 75dbf02d85933e676eee6a49045a8e8b489ac075 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Fri, 11 Dec 2015 03:25:59 +0000 Subject: [PATCH 280/498] unifi:Update download location; the binaries moved --- pkgs/servers/unifi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8fab18c434e..5e647f90de1 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.7.6"; src = fetchurl { - url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; + url = "https://www.ubnt.com/downloads/unifi/${version}/UniFi.unix.zip"; sha256 = "0xinrxcbd5gb2jgcvrx3jcslad0f19qrbjzkiir9zjq59sn68gfn"; }; From 154e88ab3fdbc0f7f201aea180a97b0903726887 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 12 Dec 2015 11:47:00 +0100 Subject: [PATCH 281/498] xprintidel-ng: init at git-2015-09-01 --- pkgs/tools/X11/xprintidle-ng/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/X11/xprintidle-ng/default.nix diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix new file mode 100644 index 00000000000..7ddab964436 --- /dev/null +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib + , autoconf, automake, libtool, gettext, pkgconfig + , git, perl, texinfo, help2man +}: +stdenv.mkDerivation rec { + version = "git-2015-09-01"; + name = "${baseName}-${version}"; + baseName = "xprintidle-ng"; + + buildInputs = [ + libX11 libXScrnSaver libXext gnulib + autoconf automake libtool gettext pkgconfig git perl + texinfo help2man + ]; + src = fetchFromGitHub { + owner = "taktoa"; + repo = "${baseName}"; + rev = "9083ba284d9222541ce7da8dc87d5a27ef5cc592"; + sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq"; + }; + + configurePhase = '' + cp -r "${gnulib}" gnulib + chmod a+rX,u+w -R gnulib + ./bootstrap --gnulib-srcdir=gnulib + ./configure --prefix="$out" + ''; + + meta = { + inherit version; + description = ''A command-line tool to print idle time from libXss''; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84cf2ed6aef..8a4a6543a82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3495,6 +3495,8 @@ let xbrightness = callPackage ../tools/X11/xbrightness { }; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; xsensors = callPackage ../os-specific/linux/xsensors { }; From becb04096988d27ea4252019fb77c1931e4bd495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 12 Dec 2015 11:33:07 +0100 Subject: [PATCH 282/498] qtcreator: 3.4.2 -> 3.5.1 Builds and runs. --- pkgs/development/qtcreator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index b2460c768f2..4051ac21836 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -3,8 +3,8 @@ with stdenv.lib; let - baseVersion = "3.4"; - revision = "2"; + baseVersion = "3.5"; + revision = "1"; version = "${baseVersion}.${revision}"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm"; + sha256 = "0r9ysq9hzig4ag9m8pcpw1jng2fqqns8zwp0jj893gh8ia0sq9ar"; }; buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ]; From 42c7004d33d166c3bd47e5f65758a9bce9855a98 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Dec 2015 11:30:44 +0100 Subject: [PATCH 283/498] checkstyle: 6.12.1 -> 6.13 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index c17c453bf55..a9cf08c4c3e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.12.1"; + version = "6.13"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "1s2qj2kz5q2wrfxk9mnw23ly3abplnly73apy37583d2nvs2hjyq"; + sha256 = "0k53kj0mx0shypagny134yrhkjgawzs5yixaxv87br52ablcqdvx"; }; installPhase = '' From 80420c318769ef9cf8108eab2161c841745133a4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Dec 2015 11:41:04 +0100 Subject: [PATCH 284/498] hevea: 2.25 -> 2.26 --- pkgs/tools/typesetting/hevea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 0626ec84fbe..3343579bbab 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.25"; + name = "hevea-2.26"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "0kn99v92xsfy12r9gfvwgs0xf3s9s6frfg86a8q6damj1dampiz4"; + sha256 = "173v6z2li12pah6315dfpwhqrdljkhsff82gj7sql812zwjkvd2f"; }; buildInputs = [ ocaml ]; From d0fbac6358e35ba63ce4af9c49e27b67ee619e03 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Dec 2015 11:48:45 +0100 Subject: [PATCH 285/498] nzbget: 16.3 -> 16.4 --- pkgs/tools/networking/nzbget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 733e12d1e9b..78ef6998e3a 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "16.3"; + version = "16.4"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz"; - sha256 = "03xzrvgqh90wx183sjrcyn7yilip92g2x5wffnw956ywxb3nsy2g"; + sha256 = "03sdzxxsjpxp82jpk593xls96yk29989z05j73jah21dbpkkx7lf"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls From de37086064d62a76fc7418944c4ab05dd28e9be8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Dec 2015 11:51:50 +0100 Subject: [PATCH 286/498] potrace: 1.12 -> 1.13 --- pkgs/applications/graphics/potrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 13636e1f1fe..3cc5fe6fdd2 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "potrace-${version}"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; - sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh"; + sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2"; }; configureFlags = [ "--with-libpotrace" ]; From e0a7c3a54bda41441ec2298a2e6f5b4653b03ed3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Dec 2015 11:58:22 +0100 Subject: [PATCH 287/498] intel-gpu-tools: 1.12 -> 1.13 --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index caed095d151..28deca284ce 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -2,11 +2,11 @@ , libX11, libXext, libXv, libXrandr, glib, bison, libunwind }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.12"; + name = "intel-gpu-tools-1.13"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1qwbwgvsqxba0adzlwxqmdw1asykx0pmk9ra0ff0nmjj9apf0gql"; + sha256 = "0d5ff9l12zw9mdsjwbwn6y9k1gz6xlzsx5k87apz9vq6q625irn6"; }; buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 From 069b1891d34f2a1a674daf6baad02d73ab8228c6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 12 Dec 2015 11:30:32 +0100 Subject: [PATCH 288/498] pkgs.wget: 1.17 -> 1.17.1 1.17.1 is a bugfix release. See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00007.html for announcement. --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 6389234342f..5abc84bb1ea 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -3,11 +3,11 @@ , libiconv, libpsl, openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.17"; + name = "wget-1.17.1"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "11xvs919a8xr595hs6hk323rkk7yshyfdfyfdhlahagkrcxdcsdx"; + sha256 = "1jcpvl5sxb2ag8yahpy370c5jlfb097a21k2mhsidh4wxdhrnmgy"; }; preConfigure = '' From b1e44d80c6803c6105102279e650545e1506d4e5 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 11 Dec 2015 01:35:45 +0100 Subject: [PATCH 289/498] pythonPackages.mpv: init at 0.1 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9c9a6698f1..9aed2686f47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9203,6 +9203,25 @@ let }; }; + mpv = buildPythonPackage rec { + name = "mpv-0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/mpv/${name}.tar.gz"; + sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw"; + }; + buildInputs = [ pkgs.mpv ]; + patchPhase = "substituteInPlace mpv.py --replace libmpv.so ${pkgs.mpv}/lib/libmpv.so"; + + meta = with pkgs.stdenv.lib; { + description = "A python interface to the mpv media player"; + homepage = "https://github.com/jaseg/python-mpv"; + license = licenses.agpl3; + }; + + }; + + mrbob = buildPythonPackage rec { name = "mrbob-${version}"; version = "0.1.1"; From 7b407414a480c806b9409def28a398c387b2e5e5 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 12 Dec 2015 13:27:03 +0100 Subject: [PATCH 290/498] telegram: create explicit folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Will be used for other tools coming soon™. --- .../instant-messengers/{ => telegram}/telegram-cli/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/networking/instant-messengers/{ => telegram}/telegram-cli/default.nix (100%) diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telegram-cli/default.nix rename to pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986004c5642..11f433b7b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13214,7 +13214,7 @@ let taskserver = callPackage ../servers/misc/taskserver { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli/default.nix { }; telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; From 7200a5c07904791b78987fe02775f52386b32a14 Mon Sep 17 00:00:00 2001 From: David A Roberts Date: Fri, 11 Dec 2015 22:35:17 +1000 Subject: [PATCH 291/498] cmdstan: init at 2.9.0 --- .../development/compilers/cmdstan/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/compilers/cmdstan/default.nix diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix new file mode 100644 index 00000000000..182808031e6 --- /dev/null +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cmdstan-2.9.0"; + + src = fetchurl { + url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz"; + sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9"; + }; + + buildFlags = "build"; + enableParallelBuilding = true; + + doCheck = true; + checkPhase = "./runCmdStanTests.py src/test/interface"; + + installPhase = '' + mkdir -p $out/opt $out/bin + cp -r . $out/opt/cmdstan + ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc + ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary + cat > $out/bin/stan < Date: Sat, 12 Dec 2015 12:31:07 +0000 Subject: [PATCH 292/498] claws-mail: enable PGP plugin by default --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index beb21546c0c..198a13567b2 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -13,7 +13,7 @@ # python requires python , enableLdap ? false , enableNetworkManager ? false -, enablePgp ? false +, enablePgp ? true , enablePluginArchive ? false , enablePluginFancy ? false , enablePluginNotificationDialogs ? true From 40242c1bff02556329718ecab9df7f899637d2d0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 06:58:51 -0600 Subject: [PATCH 293/498] kf516.breeze-icons: propagate qtsvg into user environment --- pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix index 8c86a46401d..879262c56a4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix @@ -1,8 +1,10 @@ { kdeFramework , extra-cmake-modules +, qtsvg }: kdeFramework { name = "breeze-icons"; nativeBuildInputs = [ extra-cmake-modules ]; + propagatedUserEnvPkgs = [ qtsvg ]; } From e3aa60ed81ceb45589bfc7461361bd4259cd8f63 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 07:14:47 -0600 Subject: [PATCH 294/498] kf517: init at 5.17.0 --- .../libraries/kde-frameworks-5.17/attica.nix | 11 + .../libraries/kde-frameworks-5.17/baloo.nix | 25 + .../kde-frameworks-5.17/bluez-qt.nix | 17 + .../kde-frameworks-5.17/breeze-icons.nix | 10 + .../libraries/kde-frameworks-5.17/default.nix | 114 ++++ .../0001-extra-cmake-modules-paths.patch | 74 +++ .../extra-cmake-modules/default.nix | 18 + .../extra-cmake-modules/setup-hook.sh | 27 + .../kde-frameworks-5.17/fetchsrcs.sh | 57 ++ .../frameworkintegration.nix | 17 + .../kde-frameworks-5.17/kactivities.nix | 22 + .../libraries/kde-frameworks-5.17/kapidox.nix | 12 + .../kde-frameworks-5.17/karchive.nix | 11 + .../kde-frameworks-5.17/kauth/default.nix | 16 + .../kauth/kauth-policy-install.patch | 13 + .../kde-frameworks-5.17/kbookmarks.nix | 25 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kde-frameworks-5.17/kcmutils/default.nix | 17 + .../libraries/kde-frameworks-5.17/kcodecs.nix | 11 + .../kde-frameworks-5.17/kcompletion.nix | 14 + .../libraries/kde-frameworks-5.17/kconfig.nix | 16 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kconfigwidgets/default.nix | 17 + .../kde-frameworks-5.17/kcoreaddons.nix | 16 + .../libraries/kde-frameworks-5.17/kcrash.nix | 16 + .../kde-frameworks-5.17/kdbusaddons.nix | 17 + .../kde-frameworks-5.17/kdeclarative.nix | 22 + .../libraries/kde-frameworks-5.17/kded.nix | 19 + .../kde-frameworks-5.17/kdelibs4support.nix | 32 + .../kde-frameworks-5.17/kdesignerplugin.nix | 34 ++ .../libraries/kde-frameworks-5.17/kdesu.nix | 13 + .../kde-frameworks-5.17/kdewebkit.nix | 13 + .../libraries/kde-frameworks-5.17/kdnssd.nix | 13 + .../kde-frameworks-5.17/kdoctools/default.nix | 20 + .../kdoctools-no-find-docbook-xml.patch | 12 + .../kdoctools/setup-hook.sh | 5 + .../kde-frameworks-5.17/kemoticons.nix | 17 + .../kde-frameworks-5.17/kfilemetadata.nix | 13 + .../kde-frameworks-5.17/kglobalaccel.nix | 23 + .../kde-frameworks-5.17/kguiaddons.nix | 13 + .../libraries/kde-frameworks-5.17/khtml.nix | 21 + .../libraries/kde-frameworks-5.17/ki18n.nix | 16 + .../kde-frameworks-5.17/kiconthemes.nix | 17 + .../kde-frameworks-5.17/kidletime.nix | 15 + .../kde-frameworks-5.17/kimageformats.nix | 13 + .../kinit/0001-kinit-libpath.patch | 42 ++ .../kde-frameworks-5.17/kinit/default.nix | 17 + .../libraries/kde-frameworks-5.17/kio.nix | 31 + .../kde-frameworks-5.17/kitemmodels.nix | 11 + .../kde-frameworks-5.17/kitemviews.nix | 11 + .../kde-frameworks-5.17/kjobwidgets.nix | 16 + .../libraries/kde-frameworks-5.17/kjs.nix | 16 + .../kde-frameworks-5.17/kjsembed.nix | 17 + .../kde-frameworks-5.17/kmediaplayer.nix | 15 + .../kde-frameworks-5.17/knewstuff.nix | 17 + .../kde-frameworks-5.17/knotifications.nix | 21 + .../kde-frameworks-5.17/knotifyconfig.nix | 13 + .../kpackage/0001-allow-external-paths.patch | 25 + .../0002-qdiriterator-follow-symlinks.patch | 39 ++ .../kde-frameworks-5.17/kpackage/default.nix | 26 + .../libraries/kde-frameworks-5.17/kparts.nix | 17 + .../libraries/kde-frameworks-5.17/kpeople.nix | 15 + .../kde-frameworks-5.17/kplotting.nix | 11 + .../libraries/kde-frameworks-5.17/kpty.nix | 10 + .../libraries/kde-frameworks-5.17/kross.nix | 14 + .../libraries/kde-frameworks-5.17/krunner.nix | 16 + .../0001-qdiriterator-follow-symlinks.patch | 25 + .../kservice/0002-no-canonicalize-path.patch | 25 + .../kde-frameworks-5.17/kservice/default.nix | 19 + .../kservice/setup-hook.sh | 43 ++ .../0001-no-qcoreapplication.patch | 48 ++ .../ktexteditor/default.nix | 18 + .../kde-frameworks-5.17/ktextwidgets.nix | 16 + .../kde-frameworks-5.17/kunitconversion.nix | 10 + .../libraries/kde-frameworks-5.17/kwallet.nix | 21 + .../kde-frameworks-5.17/kwidgetsaddons.nix | 11 + .../kde-frameworks-5.17/kwindowsystem.nix | 13 + .../libraries/kde-frameworks-5.17/kxmlgui.nix | 18 + .../kde-frameworks-5.17/kxmlrpcclient.nix | 10 + .../kde-frameworks-5.17/modemmanager-qt.nix | 13 + .../kde-frameworks-5.17/networkmanager-qt.nix | 13 + .../kde-frameworks-5.17/oxygen-icons5.nix | 13 + .../plasma-framework/default.nix | 25 + .../libraries/kde-frameworks-5.17/solid.nix | 17 + .../libraries/kde-frameworks-5.17/sonnet.nix | 13 + .../libraries/kde-frameworks-5.17/srcs.nix | 565 ++++++++++++++++++ .../kde-frameworks-5.17/threadweaver.nix | 11 + pkgs/top-level/all-packages.nix | 1 + 88 files changed, 2322 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/attica.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/baloo.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh create mode 100755 pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/karchive.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kded.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/khtml.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kiconthemes.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kparts.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpty.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kross.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/krunner.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/solid.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/srcs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/attica.nix b/pkgs/development/libraries/kde-frameworks-5.17/attica.nix new file mode 100644 index 00000000000..98721876c12 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/attica.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "attica"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix new file mode 100644 index 00000000000..38c41d9271d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime +, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid +}: + +kdeFramework { + name = "baloo"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + kconfig kcrash kdbusaddons lmdb qtquick1 solid + ]; + propagatedBuildInputs = [ + kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase + ]; + postInstall = '' + wrapQtProgram "$out/bin/baloo_file" + wrapQtProgram "$out/bin/baloo_file_extractor" + wrapQtProgram "$out/bin/balooctl" + wrapQtProgram "$out/bin/baloosearch" + wrapQtProgram "$out/bin/balooshow" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix new file mode 100644 index 00000000000..f981b0516f7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtdeclarative +}: + +kdeFramework { + name = "bluez-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix new file mode 100644 index 00000000000..879262c56a4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix @@ -0,0 +1,10 @@ +{ kdeFramework +, extra-cmake-modules +, qtsvg +}: + +kdeFramework { + name = "breeze-icons"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedUserEnvPkgs = [ qtsvg ]; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix new file mode 100644 index 00000000000..6c2889aa598 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix @@ -0,0 +1,114 @@ +# Maintainer's Notes: +# +# How To Update +# 1. Edit the URL in ./manifest.sh +# 2. Run ./manifest.sh +# 3. Fix build errors. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib makeSetupHook stdenv; + + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + addPackages = self: with self; { + attica = callPackage ./attica.nix {}; + baloo = callPackage ./baloo.nix {}; + bluez-qt = callPackage ./bluez-qt.nix {}; + breeze-icons = callPackage ./breeze-icons.nix {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration.nix {}; + kactivities = callPackage ./kactivities.nix {}; + kapidox = callPackage ./kapidox.nix {}; + karchive = callPackage ./karchive.nix {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs.nix {}; + kcompletion = callPackage ./kcompletion.nix {}; + kconfig = callPackage ./kconfig.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcoreaddons = callPackage ./kcoreaddons.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdbusaddons = callPackage ./kdbusaddons.nix {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kdnssd = callPackage ./kdnssd.nix {}; + kdoctools = callPackage ./kdoctools {}; + kemoticons = callPackage ./kemoticons.nix {}; + kfilemetadata = callPackage ./kfilemetadata.nix {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes.nix {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio.nix {}; + kitemmodels = callPackage ./kitemmodels.nix {}; + kitemviews = callPackage ./kitemviews.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifications = callPackage ./knotifications.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + kplotting = callPackage ./kplotting.nix {}; + kpty = callPackage ./kpty.nix {}; + kross = callPackage ./kross.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; + kwindowsystem = callPackage ./kwindowsystem.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + modemmanager-qt = callPackage ./modemmanager-qt.nix {}; + networkmanager-qt = callPackage ./networkmanager-qt.nix {}; + oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; + plasma-framework = callPackage ./plasma-framework {}; + solid = callPackage ./solid.nix {}; + sonnet = callPackage ./sonnet.nix {}; + threadweaver = callPackage ./threadweaver.nix {}; + }; + + newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); + +in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix new file mode 100644 index 00000000000..4e1b1aff3bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: + +kdeFramework { + name = "extra-cmake-modules"; + patches = [ ./0001-extra-cmake-modules-paths.patch ]; + + setupHook = ./setup-hook.sh; + + # It is OK to propagate these inputs as long as + # extra-cmake-modules is never a propagated input + # of some other derivation. + propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; + + meta = { + license = stdenv.lib.licenses.bsd2; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh new file mode 100644 index 00000000000..a6fa6189240 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,27 @@ +addMimePkg() { + local propagated + + if [[ -d "$1/share/mime" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + fi +} + +envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh new file mode 100755 index 00000000000..16a8de82c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh @@ -0,0 +1,57 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +rm -f ../srcs.csv + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +find . | while read src; do + if [[ -f "${src}" ]]; then + # Sanitize file name + filename=$(basename "$src" | tr '@' '_') + nameVersion="${filename%.tar.*}" + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') + echo "$name,$version,$src,$filename" >>../srcs.csv + fi +done + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix new file mode 100644 index 00000000000..26987c385ad --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion +, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications +, kwidgetsaddons, libXcursor, qtx11extras +}: + +kdeFramework { + name = "frameworkintegration"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kbookmarks kcompletion kconfig knotifications kwidgetsaddons + libXcursor + ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix new file mode 100644 index 00000000000..3225098f439 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n +, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative +}: + +kdeFramework { + name = "kactivities"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + boost kcmutils kconfig kcoreaddons kdbusaddons kservice + kxmlgui + ]; + propagatedBuildInputs = [ + kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$out/bin/kactivitymanagerd" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix new file mode 100644 index 00000000000..647be8f052c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix @@ -0,0 +1,12 @@ +{ kdeFramework, lib +, extra-cmake-modules +, python +}: + +kdeFramework { + name = "kapidox"; + nativeBuildInputs = [ extra-cmake-modules python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix new file mode 100644 index 00000000000..a8d9a0003c3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "karchive"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix new file mode 100644 index 00000000000..42a10019334 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, polkitQt +}: + +kdeFramework { + name = "kauth"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkitQt ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./kauth-policy-install.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix new file mode 100644 index 00000000000..1a469ab4db6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kconfigwidgets +, kcoreaddons +, kiconthemes +, kxmlgui +}: + +kdeFramework { + name = "kbookmarks"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs + kconfig + kconfigwidgets + kcoreaddons + kiconthemes + kxmlgui + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..0d861fa9501 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:43:53 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/kpluginselector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index 9c3431d..d6b1ee2 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix new file mode 100644 index 00000000000..dbbb783ac61 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets +, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews +, kpackage, kservice, kxmlgui +}: + +kdeFramework { + name = "kcmutils"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kiconthemes kitemviews kpackage kxmlgui + ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix new file mode 100644 index 00000000000..53a69a69b69 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kcodecs"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix new file mode 100644 index 00000000000..e393774f16a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kwidgetsaddons +}: + +kdeFramework { + name = "kcompletion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kwidgetsaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix new file mode 100644 index 00000000000..e132afe5988 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +}: + +kdeFramework { + name = "kconfig"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + postInstall = '' + wrapQtProgram "$out/bin/kreadconfig5" + wrapQtProgram "$out/bin/kwriteconfig5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..7a6c0ee9053 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:47:01 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/khelpclient.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix new file mode 100644 index 00000000000..0e14d06edd3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper +}: + +kdeFramework { + name = "kconfigwidgets"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ kguiaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + postInstall = '' + wrapQtProgram "$out/bin/preparetips5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix new file mode 100644 index 00000000000..f3a1db7bd48 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules +, shared_mime_info +}: + +kdeFramework { + name = "kcoreaddons"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix new file mode 100644 index 00000000000..bbab78ccb40 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwindowsystem +, qtx11extras +}: + +kdeFramework { + name = "kcrash"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix new file mode 100644 index 00000000000..d2ceab31d14 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +, qtx11extras +}: + +kdeFramework { + name = "kdbusaddons"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + propagatedBuildInputs = [ qtx11extras ]; + postInstall = '' + wrapQtProgram "$out/bin/kquitapp5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix new file mode 100644 index 00000000000..74d107466cf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage +, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig +, qtdeclarative +}: + +kdeFramework { + name = "kdeclarative"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + epoxy kguiaddons kiconthemes kwidgetsaddons + ]; + propagatedBuildInputs = [ + kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$out/bin/kpackagelauncherqml" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kded.nix b/pkgs/development/libraries/kde-frameworks-5.17/kded.nix new file mode 100644 index 00000000000..47ae2d68c68 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kded.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, kinit +, kservice +}: + +kdeFramework { + name = "kded"; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix new file mode 100644 index 00000000000..0dd5c415761 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix @@ -0,0 +1,32 @@ +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels +, kinit, knotifications, kparts, kservice, ktextwidgets +, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui +, networkmanager, qtsvg, qtx11extras, xlibs +}: + +# TODO: debug docbook detection + +kdeFramework { + name = "kdelibs4support"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; + propagatedBuildInputs = [ + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio + kiconthemes kitemmodels kinit knotifications kparts ktextwidgets + kunitconversion kwindowsystem + ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix new file mode 100644 index 00000000000..cbc114ccca0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix @@ -0,0 +1,34 @@ +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdewebkit +, kdoctools +, kiconthemes +, kio +, kitemviews +, kplotting +, ktextwidgets +, kwidgetsaddons +, kxmlgui +, sonnet +}: + +kdeFramework { + name = "kdesignerplugin"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit + kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons + kxmlgui + ]; + propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix new file mode 100644 index 00000000000..364fbd6a720 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty +, kservice +}: + +kdeFramework { + name = "kdesu"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kservice ]; + propagatedBuildInputs = [ ki18n kpty ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix new file mode 100644 index 00000000000..d361313d1d4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit +}: + +kdeFramework { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n kio qtwebkit ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix new file mode 100644 index 00000000000..f00432b0c9c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, avahi +}: + +kdeFramework { + name = "kdnssd"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ avahi ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix new file mode 100644 index 00000000000..138c3fc33b9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix @@ -0,0 +1,20 @@ +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages +}: + +kdeFramework { + name = "kdoctools"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive ]; + propagatedBuildInputs = [ ki18n ]; + propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh new file mode 100644 index 00000000000..5cfffbd622d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh @@ -0,0 +1,5 @@ +addXdgData() { + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix new file mode 100644 index 00000000000..d165f84e3a2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kservice +}: + +kdeFramework { + name = "kemoticons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kconfig kcoreaddons ]; + propagatedBuildInputs = [ kservice ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix new file mode 100644 index 00000000000..92ca1f26b93 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 +, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib +}: + +kdeFramework { + name = "kfilemetadata"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix new file mode 100644 index 00000000000..c535b3590a3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kwindowsystem +, makeQtWrapper +, qtx11extras +}: + +kdeFramework { + name = "kglobalaccel"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + postInstall = '' + wrapQtProgram "$out/bin/kglobalaccel5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix new file mode 100644 index 00000000000..bc4e9ab1184 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kguiaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix new file mode 100644 index 00000000000..d40df466ebb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, giflib, karchive +, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs +, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet +}: + +kdeFramework { + name = "khtml"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + giflib karchive kiconthemes knotifications kwallet kwidgetsaddons + kxmlgui phonon + ]; + propagatedBuildInputs = [ + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kwindowsystem qtx11extras sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix new file mode 100644 index 00000000000..915e3294b46 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, gettext +, python +, qtscript +}: + +kdeFramework { + name = "ki18n"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtscript ]; + propagatedNativeBuildInputs = [ gettext python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes.nix new file mode 100644 index 00000000000..eb24403169d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules, kconfigwidgets, ki18n +, kitemviews, qtsvg +}: + +kdeFramework { + name = "kiconthemes"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix new file mode 100644 index 00000000000..fc086560023 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtbase +, qtx11extras +}: + +kdeFramework { + name = "kidletime"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix new file mode 100644 index 00000000000..49d66bbcc2c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, ilmbase +}: + +kdeFramework { + name = "kimageformats"; + nativeBuildInputs = [ extra-cmake-modules ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch new file mode 100644 index 00000000000..9c76079a382 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 9e775b6..0ac5646 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix new file mode 100644 index 00000000000..5f644d7c424 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash +, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap +, libcap_progs +}: + +# TODO: setuid wrapper + +kdeFramework { + name = "kinit"; + nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; + buildInputs = [ kconfig kcrash kservice libcap ]; + propagatedBuildInputs = [ ki18n kio kwindowsystem ]; + patches = [ ./0001-kinit-libpath.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio.nix new file mode 100644 index 00000000000..199565e2418 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio.nix @@ -0,0 +1,31 @@ +{ kdeFramework, lib, extra-cmake-modules, acl, karchive +, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews +, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet +, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper +, qtscript, qtx11extras, solid +}: + +kdeFramework { + name = "kio"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + acl karchive kconfig kcoreaddons kdbusaddons kiconthemes + knotifications ktextwidgets kwallet kwidgetsaddons + qtscript + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets + kservice kwindowsystem kxmlgui solid qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/kcookiejar5" + wrapQtProgram "$out/bin/ktelnetservice5" + wrapQtProgram "$out/bin/ktrash5" + wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix new file mode 100644 index 00000000000..a9024d771cc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemmodels"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix new file mode 100644 index 00000000000..931019ce495 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemviews"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix new file mode 100644 index 00000000000..746edf12eea --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwidgetsaddons +, qtx11extras +}: + +kdeFramework { + name = "kjobwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwidgetsaddons ]; + propagatedBuildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix new file mode 100644 index 00000000000..768720f178c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kdoctools +, makeQtWrapper +}: + +kdeFramework { + name = "kjs"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + postInstall = '' + wrapQtProgram "$out/bin/kjs5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix new file mode 100644 index 00000000000..22eef2d47bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs +, makeQtWrapper, qtsvg +}: + +kdeFramework { + name = "kjsembed"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ ki18n kjs ]; + postInstall = '' + wrapQtProgram "$out/bin/kjscmd5" + wrapQtProgram "$out/bin/kjsconsole" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix new file mode 100644 index 00000000000..460458b2232 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kparts +, kxmlgui +}: + +kdeFramework { + name = "kmediaplayer"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kxmlgui ]; + propagatedBuildInputs = [ kparts ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix new file mode 100644 index 00000000000..5bcd6f30146 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, attica, karchive +, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio +, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui +}: + +kdeFramework { + name = "knewstuff"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kcompletion kconfig kcoreaddons kiconthemes + kitemviews ktextwidgets kwidgetsaddons + ]; + propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix new file mode 100644 index 00000000000..7e301dd0f26 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kcoreaddons +, kwindowsystem +, phonon +, qtx11extras +}: + +kdeFramework { + name = "knotifications"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs kconfig kcoreaddons phonon + ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix new file mode 100644 index 00000000000..dd99d2d4f1e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, ki18n, kio, phonon +}: + +kdeFramework { + name = "knotifyconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcompletion kconfig phonon ]; + propagatedBuildInputs = [ ki18n kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..beede4d7ccb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch @@ -0,0 +1,25 @@ +From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 28 Jan 2015 07:15:30 -0600 +Subject: [PATCH 1/2] allow external paths + +--- + src/kpackage/package.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index 539b21a..977a026 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..6e93fca9b21 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch @@ -0,0 +1,39 @@ +From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:50:28 -0500 +Subject: [PATCH 2/2] qdiriterator follow symlinks + +--- + src/kpackage/packageloader.cpp | 2 +- + src/kpackage/private/packagejobthread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index eb5ed47..94217f6 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp +index ca523b3..1cfa792 100644 +--- a/src/kpackage/private/packagejobthread.cpp ++++ b/src/kpackage/private/packagejobthread.cpp +@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) + QJsonArray plugins; + + int i = 0; +- QDirIterator it(dir, QStringList()< +Date: Wed, 14 Oct 2015 06:28:57 -0500 +Subject: [PATCH 1/2] qdiriterator follow symlinks + +--- + src/sycoca/kbuildsycoca.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index 1deae14..250baa8 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -208,7 +208,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 00000000000..685c6852611 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:31:29 -0500 +Subject: [PATCH 2/2] no canonicalize path + +--- + src/sycoca/vfolder_menu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp +index d3e31c3..d15d743 100644 +--- a/src/sycoca/vfolder_menu.cpp ++++ b/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix new file mode 100644 index 00000000000..03b7c7c2f51 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem +}: + +kdeFramework { + name = "kservice"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; + propagatedUserEnvPkgs = [ kcoreaddons ]; + patches = [ + ./0001-qdiriterator-follow-symlinks.patch + ./0002-no-canonicalize-path.patch + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh new file mode 100644 index 00000000000..c28e862ff8a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh @@ -0,0 +1,43 @@ +addServicePkg() { + local propagated + for dir in "share/kservices5" "share/kservicetypes5"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + + break + fi + done +} + +envHooks+=(addServicePkg) + +local propagated +for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z@out@" ]]; then + propagated=1 + break + fi +done +if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs @out@" +fi diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch new file mode 100644 index 00000000000..def55bff9b2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch @@ -0,0 +1,48 @@ +From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 09:08:59 -0500 +Subject: [PATCH] no qcoreapplication + +--- + src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp +index 3c63140..e3d5efe 100644 +--- a/src/syntax/data/katehighlightingindexer.cpp ++++ b/src/syntax/data/katehighlightingindexer.cpp +@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix new file mode 100644 index 00000000000..39092fbb278 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig +, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript +, qtxmlpatterns, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts qtscript + qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = [ ./0001-no-qcoreapplication.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix new file mode 100644 index 00000000000..e332d4ff9a8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem +, sonnet +}: + +kdeFramework { + name = "ktextwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kiconthemes kservice + ]; + propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix new file mode 100644 index 00000000000..3cf0f847d83 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, ki18n }: + +kdeFramework { + name = "kunitconversion"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix new file mode 100644 index 00000000000..7c4177e009d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper +}: + +kdeFramework { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kconfig kcoreaddons kdbusaddons kiconthemes knotifications + kservice kwidgetsaddons libgcrypt + ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; + postInstall = '' + wrapQtProgram "$out/bin/kwalletd5" + wrapQtProgram "$out/bin/kwallet-query" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix new file mode 100644 index 00000000000..d95f44d3fec --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kwidgetsaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix new file mode 100644 index 00000000000..09ab1f2200d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kwindowsystem"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix new file mode 100644 index 00000000000..f081d5f9170 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews +, ktextwidgets, kwindowsystem, sonnet +}: + +kdeFramework { + name = "kxmlgui"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + attica kconfig kiconthemes kitemviews ktextwidgets + ]; + propagatedBuildInputs = [ + kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix new file mode 100644 index 00000000000..20a300b68bc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: + +kdeFramework { + name = "kxmlrpcclient"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ ki18n kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix new file mode 100644 index 00000000000..7d7f769d6a9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, modemmanager +}: + +kdeFramework { + name = "modemmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ modemmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix new file mode 100644 index 00000000000..333378bd143 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, networkmanager +}: + +kdeFramework { + name = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ networkmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix new file mode 100644 index 00000000000..ee350f8e153 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix @@ -0,0 +1,13 @@ +{ kdeFramework +, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "oxygen-icons5"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix new file mode 100644 index 00000000000..d8846f77723 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio +, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, makeQtWrapper, qtscript, qtx11extras +}: + +kdeFramework { + name = "plasma-framework"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons + kiconthemes knotifications kxmlgui qtscript + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem + qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/plasmapkg2" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix b/pkgs/development/libraries/kde-frameworks-5.17/solid.nix new file mode 100644 index 00000000000..afd125e3c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/solid.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +, qtdeclarative +}: + +kdeFramework { + name = "solid"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ qtdeclarative ]; + postInstall = '' + wrapQtProgram "$out/bin/solid-hardware5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix new file mode 100644 index 00000000000..943fe04a1c9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, hunspell +}: + +kdeFramework { + name = "sonnet"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ hunspell ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix new file mode 100644 index 00000000000..8cf8d1bbad4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz"; + sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf"; + name = "attica-5.17.0.tar.xz"; + }; + }; + baloo = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz"; + sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0"; + name = "baloo-5.17.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz"; + sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5"; + name = "bluez-qt-5.17.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz"; + sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84"; + name = "breeze-icons-5.17.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz"; + sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs"; + name = "extra-cmake-modules-5.17.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz"; + sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl"; + name = "frameworkintegration-5.17.0.tar.xz"; + }; + }; + kactivities = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz"; + sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas"; + name = "kactivities-5.17.0.tar.xz"; + }; + }; + kapidox = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz"; + sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1"; + name = "kapidox-5.17.0.tar.xz"; + }; + }; + karchive = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz"; + sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1"; + name = "karchive-5.17.0.tar.xz"; + }; + }; + kauth = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz"; + sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3"; + name = "kauth-5.17.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz"; + sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya"; + name = "kbookmarks-5.17.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz"; + sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh"; + name = "kcmutils-5.17.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz"; + sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3"; + name = "kcodecs-5.17.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz"; + sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g"; + name = "kcompletion-5.17.0.tar.xz"; + }; + }; + kconfig = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz"; + sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj"; + name = "kconfig-5.17.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz"; + sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2"; + name = "kconfigwidgets-5.17.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz"; + sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n"; + name = "kcoreaddons-5.17.0.tar.xz"; + }; + }; + kcrash = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz"; + sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d"; + name = "kcrash-5.17.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz"; + sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm"; + name = "kdbusaddons-5.17.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz"; + sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k"; + name = "kdeclarative-5.17.0.tar.xz"; + }; + }; + kded = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz"; + sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk"; + name = "kded-5.17.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz"; + sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx"; + name = "kdelibs4support-5.17.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz"; + sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z"; + name = "kdesignerplugin-5.17.0.tar.xz"; + }; + }; + kdesu = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz"; + sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108"; + name = "kdesu-5.17.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz"; + sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc"; + name = "kdewebkit-5.17.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz"; + sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1"; + name = "kdnssd-5.17.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz"; + sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8"; + name = "kdoctools-5.17.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz"; + sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13"; + name = "kemoticons-5.17.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz"; + sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh"; + name = "kfilemetadata-5.17.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz"; + sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz"; + name = "kglobalaccel-5.17.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz"; + sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74"; + name = "kguiaddons-5.17.0.tar.xz"; + }; + }; + khtml = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz"; + sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4"; + name = "khtml-5.17.0.tar.xz"; + }; + }; + ki18n = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz"; + sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73"; + name = "ki18n-5.17.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz"; + sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3"; + name = "kiconthemes-5.17.0.tar.xz"; + }; + }; + kidletime = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz"; + sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95"; + name = "kidletime-5.17.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz"; + sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs"; + name = "kimageformats-5.17.0.tar.xz"; + }; + }; + kinit = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz"; + sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i"; + name = "kinit-5.17.0.tar.xz"; + }; + }; + kio = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz"; + sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l"; + name = "kio-5.17.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz"; + sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny"; + name = "kitemmodels-5.17.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz"; + sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3"; + name = "kitemviews-5.17.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz"; + sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw"; + name = "kjobwidgets-5.17.0.tar.xz"; + }; + }; + kjs = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz"; + sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4"; + name = "kjs-5.17.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz"; + sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs"; + name = "kjsembed-5.17.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz"; + sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg"; + name = "kmediaplayer-5.17.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz"; + sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s"; + name = "knewstuff-5.17.0.tar.xz"; + }; + }; + knotifications = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz"; + sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r"; + name = "knotifications-5.17.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz"; + sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n"; + name = "knotifyconfig-5.17.0.tar.xz"; + }; + }; + kpackage = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz"; + sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7"; + name = "kpackage-5.17.0.tar.xz"; + }; + }; + kparts = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz"; + sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx"; + name = "kparts-5.17.0.tar.xz"; + }; + }; + kpeople = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz"; + sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3"; + name = "kpeople-5.17.0.tar.xz"; + }; + }; + kplotting = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz"; + sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx"; + name = "kplotting-5.17.0.tar.xz"; + }; + }; + kpty = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz"; + sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc"; + name = "kpty-5.17.0.tar.xz"; + }; + }; + kross = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz"; + sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx"; + name = "kross-5.17.0.tar.xz"; + }; + }; + krunner = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz"; + sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k"; + name = "krunner-5.17.0.tar.xz"; + }; + }; + kservice = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz"; + sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8"; + name = "kservice-5.17.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz"; + sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr"; + name = "ktexteditor-5.17.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz"; + sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73"; + name = "ktextwidgets-5.17.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz"; + sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf"; + name = "kunitconversion-5.17.0.tar.xz"; + }; + }; + kwallet = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz"; + sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv"; + name = "kwallet-5.17.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz"; + sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn"; + name = "kwidgetsaddons-5.17.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz"; + sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54"; + name = "kwindowsystem-5.17.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz"; + sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn"; + name = "kxmlgui-5.17.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz"; + sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs"; + name = "kxmlrpcclient-5.17.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz"; + sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3"; + name = "modemmanager-qt-5.17.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz"; + sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l"; + name = "networkmanager-qt-5.17.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz"; + sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9"; + name = "oxygen-icons5-5.17.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz"; + sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh"; + name = "plasma-framework-5.17.0.tar.xz"; + }; + }; + solid = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz"; + sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3"; + name = "solid-5.17.0.tar.xz"; + }; + }; + sonnet = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz"; + sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv"; + name = "sonnet-5.17.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.17.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz"; + sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw"; + name = "threadweaver-5.17.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix new file mode 100644 index 00000000000..52817921cc7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "threadweaver"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ab4c78159..9b949400029 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6846,6 +6846,7 @@ let kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); kf516 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.16 { inherit pkgs; }); + kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }); kf5_stable = kf515; kf5_latest = kf516; From 54829da8229e418d955a87ab39104f65d5d99c47 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 07:15:07 -0600 Subject: [PATCH 295/498] kf517.ki18n: add missing qtdeclarative dependency --- pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix index 915e3294b46..268006512e7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix @@ -2,13 +2,14 @@ , extra-cmake-modules , gettext , python +, qtdeclarative , qtscript }: kdeFramework { name = "ki18n"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; + buildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; From cc79a6360bdfb57b610df21c84f918c4262bafd7 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 12 Dec 2015 14:26:46 +0100 Subject: [PATCH 296/498] geoclue2: 2.1.10 -> 2.4.1 --- pkgs/development/libraries/geoclue/2.0.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 88545bf732c..73d3bb92e7e 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, networkmanager, modemmanager +, dbus, dbus_glib, modemmanager, avahi }: stdenv.mkDerivation rec { - name = "geoclue-2.1.10"; + name = "geoclue-2.4.1"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "0s0ws2bx5g1cbjamxmm448r4n4crha2fwpzm8zbx6cq6qslygmzi"; + url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; + sha256 = "1m1l1npdv804m98xhfpd1wl1whrrp2pjivliwwlnyk86yq0gs6cs"; }; buildInputs = [ intltool pkgconfig glib json_glib libsoup geoip - dbus dbus_glib networkmanager modemmanager + dbus dbus_glib modemmanager avahi ]; preConfigure = '' From 77463eec42bcb5b3406b62d1a105986049eb887d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Nov 2015 19:02:03 +0000 Subject: [PATCH 297/498] use fetchurlBoot in libressl --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ab4c78159..dcd6cef383c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8005,10 +8005,14 @@ let ffmpeg = ffmpeg_0; }; - libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { }; - libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { }; # 2.3 breaks some backward-compability libressl = libressl_2_2; + libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { + fetchurl = fetchurlBoot; + }; + libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { + fetchurl = fetchurlBoot; + }; boringssl = callPackage ../development/libraries/boringssl { }; From 4cf6fef6fc1d27a74d346c9fc81c063b66dcb2e4 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 12 Dec 2015 14:41:53 +0100 Subject: [PATCH 298/498] pkgs.gcc5: 5.2.0 -> 5.3.0 gcc-5.3.0 is a bug-fix release from the GCC 5 branch. See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00002.html --- pkgs/development/compilers/gcc/5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 6decc4c8cc3..f3dda7d13f7 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -57,7 +57,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "5.2.0"; +let version = "5.3.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -212,7 +212,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "1bccp8a106xwz3wkixn65ngxif112vn90qf95m6lzpgpnl25p0sz"; + sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"; }; inherit patches; From 18af0f88d008ba967efdc8c7a1c258abc154b7ce Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 12 Dec 2015 08:46:34 -0500 Subject: [PATCH 299/498] Linux 4.3: 4.3 -> 4.3.2 --- pkgs/os-specific/linux/kernel/linux-4.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix index 7248641a5b8..00d46761b2a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.3"; - modDirVersion = "4.3.0"; + version = "4.3.2"; + extraMeta.branch = "4.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bpkr45i4yzp32p0vpnz8mlv9lk4q2q9awf1kg9khg4a9g42qqja"; + sha256 = "27689c993943f21b4a34d45889fbd02daa7edabf00561eebee1ca0670e31ae9d"; }; features.iwlwifi = true; From 5aa99f680e71918c58ade6299e06aba3f331c41a Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 12 Dec 2015 14:54:25 +0100 Subject: [PATCH 300/498] pkgs.gdb: 7.10 -> 7.10.1 See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00003.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 0f2bc98b017..547f7a81ab6 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -10,7 +10,7 @@ let - basename = "gdb-7.10"; + basename = "gdb-7.10.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1a08c9svaihqmz2mm44il1gwa810gmwkckns8b0y0v3qz52amgby"; + sha256 = "1mfnjcwnwm5cg4rc9pncs9v356a0bz6ymjyac56mbj6784yjzir5"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] From 178c20f0f6f9427d32aaa28fec90174bccc743bf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 12 Dec 2015 08:57:56 -0500 Subject: [PATCH 301/498] perlPackages.LinuxDistribution: Disable test suite. Fails on distros that aren't on its supported list, including NixOS. --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59e7ae2b2a5..04cf46e9339 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6258,6 +6258,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; sha256 = "603e27da607b3e872a669d7a66d75982f0969153eab2d4b20c341347b4ebda5f"; }; + # The tests fail if the distro it's built on isn't in the supported list. + # This includes NixOS. + doCheck = false; meta = { description = "Perl extension to detect on which Linux distribution we are running"; license = "perl"; From f27dee4eb22b26b9deac06594c38e7f94dae0eff Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 12 Dec 2015 15:04:27 +0100 Subject: [PATCH 302/498] pkgs.freeipmi: 1.4.9 -> 1.5.1 See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00000.html --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 7e3ec2358c7..3a88267f6c4 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.9"; + version = "1.5.1"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0v2xfwik2mv6z8066raiypc4xymjvr8pb0mv3mc3g4ym4km132qp"; + sha256 = "0lhjxlha4j5rx11d81y1rgp9j18rlpxsjc0flsmj6bm60awmm627"; }; buildInputs = [ libgcrypt readline ]; From 28b74a05af4330110ef90d119fcba8247a283130 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 08:09:48 -0600 Subject: [PATCH 303/498] remove kf516 --- pkgs/applications/kde-apps-15.12/default.nix | 2 +- .../libraries/kde-frameworks-5.16/attica.nix | 11 - .../libraries/kde-frameworks-5.16/baloo.nix | 25 - .../kde-frameworks-5.16/bluez-qt.nix | 17 - .../kde-frameworks-5.16/breeze-icons.nix | 10 - .../libraries/kde-frameworks-5.16/default.nix | 114 ---- .../0001-extra-cmake-modules-paths.patch | 74 --- .../extra-cmake-modules/default.nix | 18 - .../extra-cmake-modules/setup-hook.sh | 27 - .../kde-frameworks-5.16/fetchsrcs.sh | 57 -- .../frameworkintegration.nix | 17 - .../kde-frameworks-5.16/kactivities.nix | 22 - .../libraries/kde-frameworks-5.16/kapidox.nix | 12 - .../kde-frameworks-5.16/karchive.nix | 11 - .../kde-frameworks-5.16/kauth/default.nix | 16 - .../kauth/kauth-policy-install.patch | 13 - .../kde-frameworks-5.16/kbookmarks.nix | 25 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kde-frameworks-5.16/kcmutils/default.nix | 17 - .../libraries/kde-frameworks-5.16/kcodecs.nix | 11 - .../kde-frameworks-5.16/kcompletion.nix | 14 - .../libraries/kde-frameworks-5.16/kconfig.nix | 16 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kconfigwidgets/default.nix | 17 - .../kde-frameworks-5.16/kcoreaddons.nix | 16 - .../libraries/kde-frameworks-5.16/kcrash.nix | 16 - .../kde-frameworks-5.16/kdbusaddons.nix | 17 - .../kde-frameworks-5.16/kdeclarative.nix | 22 - .../libraries/kde-frameworks-5.16/kded.nix | 19 - .../kde-frameworks-5.16/kdelibs4support.nix | 32 - .../kde-frameworks-5.16/kdesignerplugin.nix | 34 -- .../libraries/kde-frameworks-5.16/kdesu.nix | 13 - .../kde-frameworks-5.16/kdewebkit.nix | 13 - .../libraries/kde-frameworks-5.16/kdnssd.nix | 13 - .../kde-frameworks-5.16/kdoctools/default.nix | 20 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kdoctools/setup-hook.sh | 5 - .../kde-frameworks-5.16/kemoticons.nix | 17 - .../kde-frameworks-5.16/kfilemetadata.nix | 13 - .../kde-frameworks-5.16/kglobalaccel.nix | 23 - .../kde-frameworks-5.16/kguiaddons.nix | 13 - .../libraries/kde-frameworks-5.16/khtml.nix | 21 - .../libraries/kde-frameworks-5.16/ki18n.nix | 16 - .../kde-frameworks-5.16/kiconthemes.nix | 17 - .../kde-frameworks-5.16/kidletime.nix | 15 - .../kde-frameworks-5.16/kimageformats.nix | 13 - .../kinit/0001-kinit-libpath.patch | 42 -- .../kde-frameworks-5.16/kinit/default.nix | 17 - .../libraries/kde-frameworks-5.16/kio.nix | 31 - .../kde-frameworks-5.16/kitemmodels.nix | 11 - .../kde-frameworks-5.16/kitemviews.nix | 11 - .../kde-frameworks-5.16/kjobwidgets.nix | 16 - .../libraries/kde-frameworks-5.16/kjs.nix | 16 - .../kde-frameworks-5.16/kjsembed.nix | 17 - .../kde-frameworks-5.16/kmediaplayer.nix | 15 - .../kde-frameworks-5.16/knewstuff.nix | 17 - .../kde-frameworks-5.16/knotifications.nix | 21 - .../kde-frameworks-5.16/knotifyconfig.nix | 13 - .../kpackage/0001-allow-external-paths.patch | 25 - .../0002-qdiriterator-follow-symlinks.patch | 39 -- .../kde-frameworks-5.16/kpackage/default.nix | 26 - .../libraries/kde-frameworks-5.16/kparts.nix | 17 - .../libraries/kde-frameworks-5.16/kpeople.nix | 15 - .../kde-frameworks-5.16/kplotting.nix | 11 - .../libraries/kde-frameworks-5.16/kpty.nix | 10 - .../libraries/kde-frameworks-5.16/kross.nix | 14 - .../libraries/kde-frameworks-5.16/krunner.nix | 16 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kservice/0002-no-canonicalize-path.patch | 25 - .../kde-frameworks-5.16/kservice/default.nix | 19 - .../kservice/setup-hook.sh | 43 -- .../0001-no-qcoreapplication.patch | 48 -- .../ktexteditor/default.nix | 18 - .../kde-frameworks-5.16/ktextwidgets.nix | 16 - .../kde-frameworks-5.16/kunitconversion.nix | 10 - .../libraries/kde-frameworks-5.16/kwallet.nix | 21 - .../kde-frameworks-5.16/kwidgetsaddons.nix | 11 - .../kde-frameworks-5.16/kwindowsystem.nix | 13 - .../libraries/kde-frameworks-5.16/kxmlgui.nix | 18 - .../kde-frameworks-5.16/kxmlrpcclient.nix | 10 - .../kde-frameworks-5.16/modemmanager-qt.nix | 13 - .../kde-frameworks-5.16/networkmanager-qt.nix | 13 - .../kde-frameworks-5.16/oxygen-icons5.nix | 13 - .../plasma-framework/default.nix | 25 - .../libraries/kde-frameworks-5.16/solid.nix | 17 - .../libraries/kde-frameworks-5.16/sonnet.nix | 13 - .../libraries/kde-frameworks-5.16/srcs.nix | 565 ------------------ .../kde-frameworks-5.16/threadweaver.nix | 11 - pkgs/top-level/all-packages.nix | 4 +- 89 files changed, 3 insertions(+), 2324 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/attica.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/baloo.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh delete mode 100755 pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/karchive.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kded.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/khtml.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kio.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kjs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kpackage/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kparts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kpeople.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kplotting.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kpty.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kross.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/krunner.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kservice/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/solid.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/srcs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index 0c8c0780aaf..807c32ccb7d 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -49,6 +49,6 @@ let l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); }; - newScope = scope: pkgs.kf516.newScope ({ inherit kdeApp; } // scope); + newScope = scope: pkgs.kf517.newScope ({ inherit kdeApp; } // scope); in lib.makeScope newScope packages diff --git a/pkgs/development/libraries/kde-frameworks-5.16/attica.nix b/pkgs/development/libraries/kde-frameworks-5.16/attica.nix deleted file mode 100644 index 98721876c12..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix deleted file mode 100644 index 38c41d9271d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/baloo.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig -, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid -}: - -kdeFramework { - name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kconfig kcrash kdbusaddons lmdb qtquick1 solid - ]; - propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase - ]; - postInstall = '' - wrapQtProgram "$out/bin/baloo_file" - wrapQtProgram "$out/bin/baloo_file_extractor" - wrapQtProgram "$out/bin/balooctl" - wrapQtProgram "$out/bin/baloosearch" - wrapQtProgram "$out/bin/balooshow" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix deleted file mode 100644 index f981b0516f7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/bluez-qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtdeclarative -}: - -kdeFramework { - name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix deleted file mode 100644 index 879262c56a4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework -, extra-cmake-modules -, qtsvg -}: - -kdeFramework { - name = "breeze-icons"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedUserEnvPkgs = [ qtsvg ]; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/default.nix deleted file mode 100644 index 6c2889aa598..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib makeSetupHook stdenv; - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - addPackages = self: with self; { - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - breeze-icons = callPackage ./breeze-icons.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata.nix {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; - plasma-framework = callPackage ./plasma-framework {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; - }; - - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix deleted file mode 100644 index 4e1b1aff3bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - patches = [ ./0001-extra-cmake-modules-paths.patch ]; - - setupHook = ./setup-hook.sh; - - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = { - license = stdenv.lib.licenses.bsd2; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index a6fa6189240..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,27 +0,0 @@ -addMimePkg() { - local propagated - - if [[ -d "$1/share/mime" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - fi -} - -envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh deleted file mode 100755 index 72d83057545..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/fetchsrcs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.16/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <>../srcs.nix <>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix deleted file mode 100644 index 26987c385ad..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/frameworkintegration.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion -, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, libXcursor, qtx11extras -}: - -kdeFramework { - name = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kbookmarks kcompletion kconfig knotifications kwidgetsaddons - libXcursor - ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix deleted file mode 100644 index 3225098f439..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kactivities.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig -, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative -}: - -kdeFramework { - name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kxmlgui - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kactivitymanagerd" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix deleted file mode 100644 index 647be8f052c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kapidox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix deleted file mode 100644 index a8d9a0003c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/karchive.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix deleted file mode 100644 index 42a10019334..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kauth/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, polkitQt -}: - -kdeFramework { - name = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./kauth-policy-install.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix deleted file mode 100644 index 1a469ab4db6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kbookmarks.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui -}: - -kdeFramework { - name = "kbookmarks"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 0d861fa9501..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:43:53 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 9c3431d..d6b1ee2 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix deleted file mode 100644 index dbbb783ac61..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcmutils/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets -, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews -, kpackage, kservice, kxmlgui -}: - -kdeFramework { - name = "kcmutils"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kiconthemes kitemviews kpackage kxmlgui - ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix deleted file mode 100644 index 53a69a69b69..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix deleted file mode 100644 index e393774f16a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcompletion.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: - -kdeFramework { - name = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix deleted file mode 100644 index e132afe5988..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfig.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -}: - -kdeFramework { - name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kreadconfig5" - wrapQtProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a6c0ee9053..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix deleted file mode 100644 index 0e14d06edd3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kconfigwidgets/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper -}: - -kdeFramework { - name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kguiaddons ]; - propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - wrapQtProgram "$out/bin/preparetips5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix deleted file mode 100644 index f3a1db7bd48..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules -, shared_mime_info -}: - -kdeFramework { - name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ shared_mime_info ]; - postInstall = '' - wrapQtProgram "$out/bin/desktoptojson" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix deleted file mode 100644 index bbab78ccb40..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcrash.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix deleted file mode 100644 index d2ceab31d14..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdbusaddons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - propagatedBuildInputs = [ qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix deleted file mode 100644 index 74d107466cf..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdeclarative.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig -, qtdeclarative -}: - -kdeFramework { - name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons - ]; - propagatedBuildInputs = [ - kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kpackagelauncherqml" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kded.nix b/pkgs/development/libraries/kde-frameworks-5.16/kded.nix deleted file mode 100644 index 47ae2d68c68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kded.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix deleted file mode 100644 index 0dd5c415761..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdelibs4support.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs -}: - -# TODO: debug docbook detection - -kdeFramework { - name = "kdelibs4support"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; - propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix deleted file mode 100644 index cbc114ccca0..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdewebkit -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet -}: - -kdeFramework { - name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui - ]; - propagatedBuildInputs = [ kio sonnet ]; - postInstall = '' - wrapQtProgram "$out/bin/kgendesignerplugin" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix deleted file mode 100644 index 364fbd6a720..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesu.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty -, kservice -}: - -kdeFramework { - name = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kservice ]; - propagatedBuildInputs = [ ki18n kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix deleted file mode 100644 index d361313d1d4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdewebkit.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit -}: - -kdeFramework { - name = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n kio qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix deleted file mode 100644 index f00432b0c9c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdnssd.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, avahi -}: - -kdeFramework { - name = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix deleted file mode 100644 index 138c3fc33b9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages -}: - -kdeFramework { - name = "kdoctools"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ]; - propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh deleted file mode 100644 index 5cfffbd622d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdoctools/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addXdgData() { - addToSearchPath XDG_DATA_DIRS "$1/share" -} - -envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix deleted file mode 100644 index d165f84e3a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kemoticons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice -}: - -kdeFramework { - name = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix deleted file mode 100644 index 92ca1f26b93..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kfilemetadata.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix deleted file mode 100644 index c535b3590a3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kglobalaccel.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kglobalaccel5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix deleted file mode 100644 index bc4e9ab1184..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kguiaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kguiaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix deleted file mode 100644 index d40df466ebb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/khtml.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive -, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs -, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet -}: - -kdeFramework { - name = "khtml"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kxmlgui phonon - ]; - propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets - kwindowsystem qtx11extras sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix deleted file mode 100644 index 915e3294b46..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ki18n.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtscript -}: - -kdeFramework { - name = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; - propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix deleted file mode 100644 index eb24403169d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules, kconfigwidgets, ki18n -, kitemviews, qtsvg -}: - -kdeFramework { - name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/kiconfinder5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix deleted file mode 100644 index fc086560023..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kidletime.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras -}: - -kdeFramework { - name = "kidletime"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix deleted file mode 100644 index 49d66bbcc2c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kimageformats.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ilmbase -}: - -kdeFramework { - name = "kimageformats"; - nativeBuildInputs = [ extra-cmake-modules ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix deleted file mode 100644 index 5f644d7c424..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kinit/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash -, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap -, libcap_progs -}: - -# TODO: setuid wrapper - -kdeFramework { - name = "kinit"; - nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice libcap ]; - propagatedBuildInputs = [ ki18n kio kwindowsystem ]; - patches = [ ./0001-kinit-libpath.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix deleted file mode 100644 index 199565e2418..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, acl, karchive -, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews -, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper -, qtscript, qtx11extras, solid -}: - -kdeFramework { - name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons - qtscript - ]; - propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kwindowsystem kxmlgui solid qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/kcookiejar5" - wrapQtProgram "$out/bin/ktelnetservice5" - wrapQtProgram "$out/bin/ktrash5" - wrapQtProgram "$out/bin/kmailservice5" - wrapQtProgram "$out/bin/protocoltojson" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix deleted file mode 100644 index a9024d771cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kitemmodels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix deleted file mode 100644 index 931019ce495..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kitemviews.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix deleted file mode 100644 index 746edf12eea..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjobwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qtx11extras -}: - -kdeFramework { - name = "kjobwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons ]; - propagatedBuildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix deleted file mode 100644 index 768720f178c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -}: - -kdeFramework { - name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kjs5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix deleted file mode 100644 index 22eef2d47bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kjsembed.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, makeQtWrapper, qtsvg -}: - -kdeFramework { - name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ qtsvg ]; - propagatedBuildInputs = [ ki18n kjs ]; - postInstall = '' - wrapQtProgram "$out/bin/kjscmd5" - wrapQtProgram "$out/bin/kjsconsole" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix deleted file mode 100644 index 460458b2232..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kparts -, kxmlgui -}: - -kdeFramework { - name = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix deleted file mode 100644 index 5bcd6f30146..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knewstuff.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive -, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio -, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui -}: - -kdeFramework { - name = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kcompletion kconfig kcoreaddons kiconthemes - kitemviews ktextwidgets kwidgetsaddons - ]; - propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix deleted file mode 100644 index 7e301dd0f26..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons phonon - ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix deleted file mode 100644 index dd99d2d4f1e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/knotifyconfig.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, ki18n, kio, phonon -}: - -kdeFramework { - name = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig phonon ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH 1/2] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:50:28 -0500 -Subject: [PATCH 2/2] qdiriterator follow symlinks - ---- - src/kpackage/packageloader.cpp | 2 +- - src/kpackage/private/packagejobthread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp -index eb5ed47..94217f6 100644 ---- a/src/kpackage/packageloader.cpp -+++ b/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index ca523b3..1cfa792 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) - QJsonArray plugins; - - int i = 0; -- QDirIterator it(dir, QStringList()< -Date: Wed, 14 Oct 2015 06:28:57 -0500 -Subject: [PATCH 1/2] qdiriterator follow symlinks - ---- - src/sycoca/kbuildsycoca.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp -index 1deae14..250baa8 100644 ---- a/src/sycoca/kbuildsycoca.cpp -+++ b/src/sycoca/kbuildsycoca.cpp -@@ -208,7 +208,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch deleted file mode 100644 index 685c6852611..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/0002-no-canonicalize-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:31:29 -0500 -Subject: [PATCH 2/2] no canonicalize path - ---- - src/sycoca/vfolder_menu.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp -index d3e31c3..d15d743 100644 ---- a/src/sycoca/vfolder_menu.cpp -+++ b/src/sycoca/vfolder_menu.cpp -@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix deleted file mode 100644 index 03b7c7c2f51..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - propagatedUserEnvPkgs = [ kcoreaddons ]; - patches = [ - ./0001-qdiriterator-follow-symlinks.patch - ./0002-no-canonicalize-path.patch - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh deleted file mode 100644 index c28e862ff8a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kservice/setup-hook.sh +++ /dev/null @@ -1,43 +0,0 @@ -addServicePkg() { - local propagated - for dir in "share/kservices5" "share/kservicetypes5"; do - if [[ -d "$1/$dir" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - - break - fi - done -} - -envHooks+=(addServicePkg) - -local propagated -for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z@out@" ]]; then - propagated=1 - break - fi -done -if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs @out@" -fi diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index def55bff9b2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 09:08:59 -0500 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3c63140..e3d5efe 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix deleted file mode 100644 index 39092fbb278..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktexteditor/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig -, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript -, qtxmlpatterns, sonnet -}: - -kdeFramework { - name = "ktexteditor"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts qtscript - qtxmlpatterns - ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; - patches = [ ./0001-no-qcoreapplication.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix deleted file mode 100644 index e332d4ff9a8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/ktextwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem -, sonnet -}: - -kdeFramework { - name = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice - ]; - propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix deleted file mode 100644 index 3cf0f847d83..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kunitconversion.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: - -kdeFramework { - name = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix deleted file mode 100644 index 7c4177e009d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwallet.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper -}: - -kdeFramework { - name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kiconthemes knotifications - kservice kwidgetsaddons libgcrypt - ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; - postInstall = '' - wrapQtProgram "$out/bin/kwalletd5" - wrapQtProgram "$out/bin/kwallet-query" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix deleted file mode 100644 index d95f44d3fec..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwidgetsaddons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix deleted file mode 100644 index 09ab1f2200d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kwindowsystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix deleted file mode 100644 index f081d5f9170..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kxmlgui.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig -, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews -, ktextwidgets, kwindowsystem, sonnet -}: - -kdeFramework { - name = "kxmlgui"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - attica kconfig kiconthemes kitemviews ktextwidgets - ]; - propagatedBuildInputs = [ - kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix deleted file mode 100644 index 20a300b68bc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/kxmlrpcclient.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: - -kdeFramework { - name = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix deleted file mode 100644 index 7d7f769d6a9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/modemmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager -}: - -kdeFramework { - name = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix deleted file mode 100644 index 333378bd143..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/networkmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, networkmanager -}: - -kdeFramework { - name = "networkmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix deleted file mode 100644 index ee350f8e153..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/oxygen-icons5.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework -, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "oxygen-icons5"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix deleted file mode 100644 index d8846f77723..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/plasma-framework/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio -, knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, makeQtWrapper, qtscript, qtx11extras -}: - -kdeFramework { - name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kxmlgui qtscript - ]; - propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem - qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/plasmapkg2" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/solid.nix b/pkgs/development/libraries/kde-frameworks-5.16/solid.nix deleted file mode 100644 index afd125e3c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/solid.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtdeclarative -}: - -kdeFramework { - name = "solid"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ qtdeclarative ]; - postInstall = '' - wrapQtProgram "$out/bin/solid-hardware5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix deleted file mode 100644 index 943fe04a1c9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/sonnet.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, hunspell -}: - -kdeFramework { - name = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix deleted file mode 100644 index 8e3d6a4a921..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/srcs.nix +++ /dev/null @@ -1,565 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/attica-5.16.0.tar.xz"; - sha256 = "1739pf892vgvl03l4322p09p346ca4nghc50ansny7868c73f95w"; - name = "attica-5.16.0.tar.xz"; - }; - }; - baloo = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/baloo-5.16.0.tar.xz"; - sha256 = "0s8l9q43ak87sjagashxfwadildlz3vdysj96in6v3gcg09ngm8j"; - name = "baloo-5.16.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/bluez-qt-5.16.0.tar.xz"; - sha256 = "0xxlwb4kqiiqmph9vr6ppyzjndzz1ys9qbnzzinrhhdmiir5m3k6"; - name = "bluez-qt-5.16.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/breeze-icons-5.16.0.tar.xz"; - sha256 = "1vmwnqin9p6p78kshn1bfq7zz1znmm615bq28545shywfkri1yil"; - name = "breeze-icons-5.16.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/extra-cmake-modules-5.16.0.tar.xz"; - sha256 = "06xfmxbjkrdswh2n0qmdi5zvm3dqhawiazi5x6p32n77ij5wiph9"; - name = "extra-cmake-modules-5.16.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/frameworkintegration-5.16.0.tar.xz"; - sha256 = "0vyv3c34mpp6yjgqm8gyir7cwxn3a064q5d3ms49macpjkkz7c6f"; - name = "frameworkintegration-5.16.0.tar.xz"; - }; - }; - kactivities = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kactivities-5.16.0.tar.xz"; - sha256 = "0aq0yxbzhg3r9jpddn1vnylmjb2xr4xx5rviisyfa6nhn21ynqxm"; - name = "kactivities-5.16.0.tar.xz"; - }; - }; - kapidox = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kapidox-5.16.0.tar.xz"; - sha256 = "0gfxnssbkdkfncka956y5d2w3zm7yxkl11jvl88cwg6zx2rfh1a4"; - name = "kapidox-5.16.0.tar.xz"; - }; - }; - karchive = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/karchive-5.16.0.tar.xz"; - sha256 = "0rn8n7lnw9z7rl1d2cdy59j4f38jzd6sj0s33dkfk04i4kl0ccpc"; - name = "karchive-5.16.0.tar.xz"; - }; - }; - kauth = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kauth-5.16.0.tar.xz"; - sha256 = "1972c4m7kcj7hnklvy973935sn0khl4jby6g8q2i5hzivp5b0sn3"; - name = "kauth-5.16.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kbookmarks-5.16.0.tar.xz"; - sha256 = "009yls3f4l97z1hcn9nk0j35b0kfysc2l0gvdnijk9prgldn287j"; - name = "kbookmarks-5.16.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcmutils-5.16.0.tar.xz"; - sha256 = "1cz3lgwm6vp39c40yykg26791xcjk3vr83266nhcyl6cm7dk04rl"; - name = "kcmutils-5.16.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcodecs-5.16.0.tar.xz"; - sha256 = "164yj6mpqb7hl9v5xdhgwpddrk7d4qig8qhx9i8xlxbb2v30rlcp"; - name = "kcodecs-5.16.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcompletion-5.16.0.tar.xz"; - sha256 = "084nqd5j7rffqh67v862h88zsqks3pyynw2fzmayhngcjm1y8c22"; - name = "kcompletion-5.16.0.tar.xz"; - }; - }; - kconfig = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kconfig-5.16.0.tar.xz"; - sha256 = "1871ixmk4z4ajfnszlyba4ibmywz0iw7ibg073wwzm3hpx2nizmf"; - name = "kconfig-5.16.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kconfigwidgets-5.16.0.tar.xz"; - sha256 = "11pl9295qnvz9284liyacz87hb5w5a4ybzcyg0jchc62aw1q9bi6"; - name = "kconfigwidgets-5.16.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcoreaddons-5.16.0.tar.xz"; - sha256 = "1944csk50q42a2prm6fijnzi1cds23phdzkfvsxlxxxzga7744fm"; - name = "kcoreaddons-5.16.0.tar.xz"; - }; - }; - kcrash = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kcrash-5.16.0.tar.xz"; - sha256 = "1bk7dvlzxs6n63iy0lmb7jgwa3np0ja4ldvwxx1y82gq593dqwa9"; - name = "kcrash-5.16.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdbusaddons-5.16.0.tar.xz"; - sha256 = "0ykfgmhisyiah9nisb73xcdfnxgiwcpjzry68x9j1r60b506r6za"; - name = "kdbusaddons-5.16.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdeclarative-5.16.0.tar.xz"; - sha256 = "0ck8w2vd9z288h08zc8fa2bndgcg6m63g34dl95snb4h00ciybd4"; - name = "kdeclarative-5.16.0.tar.xz"; - }; - }; - kded = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kded-5.16.0.tar.xz"; - sha256 = "0p0mxa989k9n45iaq0ymgr228nx4g31v3bcbdm2vlzzr524jnx8q"; - name = "kded-5.16.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kdelibs4support-5.16.0.tar.xz"; - sha256 = "0y2m67h79in7hdlv95g31kkdnjafdda1h26dm9fdjv52183n8kdc"; - name = "kdelibs4support-5.16.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdesignerplugin-5.16.0.tar.xz"; - sha256 = "1x2kd70nyvykcmd4whnv991pqyflpaahans5jaz0v0y1a2l67965"; - name = "kdesignerplugin-5.16.0.tar.xz"; - }; - }; - kdesu = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdesu-5.16.0.tar.xz"; - sha256 = "10g7vg8q2hibdh098n373jg8njzr0w9dxyfi9yb84pjyyshj7km6"; - name = "kdesu-5.16.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdewebkit-5.16.0.tar.xz"; - sha256 = "1nq6j1k3ddp9p40mdgczcvv0ba16haz3s4km9pyxsv7qwrbpm6wa"; - name = "kdewebkit-5.16.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdnssd-5.16.0.tar.xz"; - sha256 = "1ds1xvw7v75vz2nnrygy10slwysis75y57s8xafsw7fhs8sybvc3"; - name = "kdnssd-5.16.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kdoctools-5.16.0.tar.xz"; - sha256 = "1qf82drggsbhwlwsrmwbk6m0x4jhihhx0wz32y7ybhn867p8glgb"; - name = "kdoctools-5.16.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kemoticons-5.16.0.tar.xz"; - sha256 = "166la4160vjf444cylyr4dnc507fqsifl9qpdw2gqa8nw45w6kms"; - name = "kemoticons-5.16.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kfilemetadata-5.16.0.tar.xz"; - sha256 = "1yf7hgpgrvw8qvyj0l8c828y6xh3w3grslg4s9grx93jsw2jpypm"; - name = "kfilemetadata-5.16.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kglobalaccel-5.16.0.tar.xz"; - sha256 = "12hxhi8b53az3qrpgcjz494vylbqgxq3921qhsccy3nvywg7r3mv"; - name = "kglobalaccel-5.16.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kguiaddons-5.16.0.tar.xz"; - sha256 = "1gv0rhr06xzgkw1pj1nc4jbc6vmr952bbvs1vp3x2609pfn7d8b4"; - name = "kguiaddons-5.16.0.tar.xz"; - }; - }; - khtml = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/khtml-5.16.0.tar.xz"; - sha256 = "11q66h7hlsmjc7rj4m70yian6vymbjisz7yw7ck81qbv7b75w9bk"; - name = "khtml-5.16.0.tar.xz"; - }; - }; - ki18n = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ki18n-5.16.0.tar.xz"; - sha256 = "08hxinx0x8b4pprx23a6aklc9sd26cd21ajdzlk2wrv8jp3dl2pw"; - name = "ki18n-5.16.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kiconthemes-5.16.0.tar.xz"; - sha256 = "10y9rz4dmza6xjl8n9hhjpymnxzpdqk6w82s7d4yaam2kkv5hysk"; - name = "kiconthemes-5.16.0.tar.xz"; - }; - }; - kidletime = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kidletime-5.16.0.tar.xz"; - sha256 = "1s51xbn2i50d7dpl7p9aq92gy5zvgxb0liaq36f425g3hzmdkr57"; - name = "kidletime-5.16.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kimageformats-5.16.0.tar.xz"; - sha256 = "02jsmz3ysddywd9v7y8cbsvanpg4d9xwbgr0sqxb600a4s0z797s"; - name = "kimageformats-5.16.0.tar.xz"; - }; - }; - kinit = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kinit-5.16.0.tar.xz"; - sha256 = "1flpxypblj7jjv854f81xd6yx3x1wsns18hpp19jnwb54w2xy0g0"; - name = "kinit-5.16.0.tar.xz"; - }; - }; - kio = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kio-5.16.0.tar.xz"; - sha256 = "1mm94ywvkfnrfkd29vhcnc8v3ly9d33vvjmrhz9r2q3rw4zyjpiv"; - name = "kio-5.16.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kitemmodels-5.16.0.tar.xz"; - sha256 = "1bm948adzhqpq698wg1bqxz09cmpxwqhpv1qvb6fgnxv2fyjgdg2"; - name = "kitemmodels-5.16.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kitemviews-5.16.0.tar.xz"; - sha256 = "1bv41lijf3yh2dwwkwjp80sxz5yffyl1hqs7prhhv2jyn88xpx6a"; - name = "kitemviews-5.16.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kjobwidgets-5.16.0.tar.xz"; - sha256 = "07dclwc85294ca3vkg1sf9zqcgr3brzjimb8qqy0svdbfvbr0kxa"; - name = "kjobwidgets-5.16.0.tar.xz"; - }; - }; - kjs = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kjs-5.16.0.tar.xz"; - sha256 = "0zj5px9wx5c5yzlsz48bahi0xnshn3xbrfm4l9j4x4nj4vk3jksv"; - name = "kjs-5.16.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kjsembed-5.16.0.tar.xz"; - sha256 = "17vsbz0a6cd0nfjpwlyr6401pfrz0snxrcqwnj0llcmbpkbc3las"; - name = "kjsembed-5.16.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kmediaplayer-5.16.0.tar.xz"; - sha256 = "0j9g13qd7l2kwn1imphdsannjdxbx3jk8jl3d9xa6g33mqav8bjc"; - name = "kmediaplayer-5.16.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knewstuff-5.16.0.tar.xz"; - sha256 = "0213lnnlah2jq8a5rbbwzjxl0qc0cgmsnixjbkbvq3wr7yb1s6hr"; - name = "knewstuff-5.16.0.tar.xz"; - }; - }; - knotifications = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knotifications-5.16.0.tar.xz"; - sha256 = "0bfr68a2favrnmpmck16vrqy8mni72plkn0fv0fl6bfq3fmi645a"; - name = "knotifications-5.16.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/knotifyconfig-5.16.0.tar.xz"; - sha256 = "0ma5s4451h9jl9va4nnjrwhxgq5jmgq2b0m5y7hdh7m03hwhjqmc"; - name = "knotifyconfig-5.16.0.tar.xz"; - }; - }; - kpackage = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpackage-5.16.0.tar.xz"; - sha256 = "0js7dbg0y6b6nqnwc70706pchxpg12l9g7si1qab2jq8ir5drrap"; - name = "kpackage-5.16.0.tar.xz"; - }; - }; - kparts = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kparts-5.16.0.tar.xz"; - sha256 = "0g405r2x900d8c5jdsspy05m70agj3gqja6y3j319b8ph3yycnq4"; - name = "kparts-5.16.0.tar.xz"; - }; - }; - kpeople = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpeople-5.16.0.tar.xz"; - sha256 = "07lsacynsr3mzqyizbq3mywk8d54kyzfx5a3nminf2hs5a1wgg8m"; - name = "kpeople-5.16.0.tar.xz"; - }; - }; - kplotting = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kplotting-5.16.0.tar.xz"; - sha256 = "1fc448f52lf8nvs2zi2r55vqfhph7qdvdwvdpk0gz8jadj4gciz7"; - name = "kplotting-5.16.0.tar.xz"; - }; - }; - kpty = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kpty-5.16.0.tar.xz"; - sha256 = "074sws3rvjs090l2cbhl9gxcgb6bjlxard8ylmrkhvqr0dc9syvc"; - name = "kpty-5.16.0.tar.xz"; - }; - }; - kross = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/kross-5.16.0.tar.xz"; - sha256 = "05mwldy2jwal5pjn6hbiny61xd02sbljkkbyc33ni5qiiznxjk56"; - name = "kross-5.16.0.tar.xz"; - }; - }; - krunner = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/portingAids/krunner-5.16.0.tar.xz"; - sha256 = "1rk7j6kj3sv6dqnv98hprdyrp94wz57lr1lvlmw11kdlm1mmh45p"; - name = "krunner-5.16.0.tar.xz"; - }; - }; - kservice = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kservice-5.16.0.tar.xz"; - sha256 = "140b4jxs3s00xbbbh8jjqw9q5krsd7xh4qal2k0hjk0nfx5blvp9"; - name = "kservice-5.16.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ktexteditor-5.16.0.tar.xz"; - sha256 = "0g1yms864jq83c48j5ida4pmwisqxn49kl5daf7c1ssaia1pxfqw"; - name = "ktexteditor-5.16.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/ktextwidgets-5.16.0.tar.xz"; - sha256 = "1vzklpq1zdn3cg5hh7f2988q3sdn6y9mr1hgkmpcsc1y8pfhn7w9"; - name = "ktextwidgets-5.16.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kunitconversion-5.16.0.tar.xz"; - sha256 = "1ppmma1z1hk9shfn1w7dvy72872ryyqs9252s65pzx3ycrd00nll"; - name = "kunitconversion-5.16.0.tar.xz"; - }; - }; - kwallet = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwallet-5.16.0.tar.xz"; - sha256 = "1gcwc7m8q5ya3gbj02pmmjaigpr0y94m3h526b2xdbksc23kv2gi"; - name = "kwallet-5.16.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwidgetsaddons-5.16.0.tar.xz"; - sha256 = "0vzyikwp351sdywh38m6jj851sf5l4s8mxyvf5i6jkzpzl5591a3"; - name = "kwidgetsaddons-5.16.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kwindowsystem-5.16.0.tar.xz"; - sha256 = "07hl0sy0573nwddzyph5s75h983569p5bb96gxjbh0lh3ixar2ig"; - name = "kwindowsystem-5.16.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kxmlgui-5.16.0.tar.xz"; - sha256 = "1vzhf29gd5kn94x1cydnblb5v5163a52vpwh7fpsg3dlhhwd9h2s"; - name = "kxmlgui-5.16.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/kxmlrpcclient-5.16.0.tar.xz"; - sha256 = "1pacf0q67xckw8nvj3bncz5ydsmiw2a0fksmabklpbdmi9p2dz0a"; - name = "kxmlrpcclient-5.16.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/modemmanager-qt-5.16.0.tar.xz"; - sha256 = "0q135rhp52pk3ilmx9gx2cmn2p834s56kcqg3vdfycvi5gmvn81x"; - name = "modemmanager-qt-5.16.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/networkmanager-qt-5.16.0.tar.xz"; - sha256 = "115r211bf16dlcccib6dg0fd22g9kq9xshh8vf7f4msaa63kdfjv"; - name = "networkmanager-qt-5.16.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/oxygen-icons5-5.16.0.tar.xz"; - sha256 = "0nmr1jp3kr41k4wn9jvj1yvq9w51ljajzk94qf5k7rh68dzj4jl7"; - name = "oxygen-icons5-5.16.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/plasma-framework-5.16.0.tar.xz"; - sha256 = "1snih6i9n29c48sfw51csl99khps1c9bralb599d3c6q1j4iqzp3"; - name = "plasma-framework-5.16.0.tar.xz"; - }; - }; - solid = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/solid-5.16.0.tar.xz"; - sha256 = "1km4nb8cmqag2lpwgrmjj5rn8lv6s9lbhh2d3dfb2f0lmnqm00sl"; - name = "solid-5.16.0.tar.xz"; - }; - }; - sonnet = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/sonnet-5.16.0.tar.xz"; - sha256 = "1fn729ijclvdrxw9h0c23sbayfagh2jb7yglgsqqjsg3bdp72qi7"; - name = "sonnet-5.16.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.16.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.16/threadweaver-5.16.0.tar.xz"; - sha256 = "1ansjzfl6bvwqw2yi597gvzikyaaf8z5pvldwfd4mamb3vl42y4y"; - name = "threadweaver-5.16.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix deleted file mode 100644 index 52817921cc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.16/threadweaver.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b949400029..6a189988540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6845,10 +6845,9 @@ let }; kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); - kf516 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.16 { inherit pkgs; }); kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }); kf5_stable = kf515; - kf5_latest = kf516; + kf5_latest = kf517; kf5PackagesFun = self: with self; { @@ -6891,6 +6890,7 @@ let }; kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun; + kf517Packages = lib.makeScope kf517.newScope kf5PackagesFun; kf5Packages = kf515Packages; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; From 612781e8169bf13fde26091f2d6c55ebed6ccb6f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Dec 2015 16:55:09 +0100 Subject: [PATCH 304/498] simp_le service: letsencrypt cert auto-renewal This new service invokes `simp_le` for a defined set of certs on a regular basis with a systemd timer. `simp_le` is smart enough to handle account registration, domain validation and renewal on its own. The only thing required is an existing HTTP server that serves the path `/.well-known/acme-challenge` from the webroot cert parameter. Example: services.simp_le.certs."foo.example.com" = { webroot = "/var/www/challenges"; extraDomains = [ "www.example.com" ]; email = "foo@example.com"; validMin = 2592000; renewInterval = "weekly"; }; Example Nginx vhost: services.nginx.appendConfig = '' http { server { server_name _; listen 80; listen [::]:80; location /.well-known/acme-challenge { root /var/www/challenges; } location / { return 301 https://$host$request_uri; } } } ''; --- nixos/modules/module-list.nix | 1 + nixos/modules/services/security/simp_le.nix | 133 ++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 nixos/modules/services/security/simp_le.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 963daf721ad..c708f095f40 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -388,6 +388,7 @@ ./services/security/hologram.nix ./services/security/munge.nix ./services/security/physlock.nix + ./services/security/simp_le.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/services/security/simp_le.nix new file mode 100644 index 00000000000..d578d5bb679 --- /dev/null +++ b/nixos/modules/services/security/simp_le.nix @@ -0,0 +1,133 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.simp_le; + + certOpts = { ... }: { + options = { + webroot = mkOption { + type = types.nullOr types.str; + default = null; + description = "Where the webroot of the HTTP vhost is located."; + }; + + validMin = mkOption { + type = types.int; + default = 2592000; + description = "Minimum remaining validity before renewal in seconds."; + }; + + renewInterval = mkOption { + type = types.str; + default = "weekly"; + description = "Systemd calendar expression when to check for renewal. See systemd.time(7)."; + }; + + email = mkOption { + type = types.nullOr types.str; + default = null; + description = "Contact email address for the CA to be able to reach you."; + }; + + plugins = mkOption { + type = types.listOf (types.enum [ + "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh" + "fullchain.der" "fullchain.pem" "key.der" "key.pem" + ]); + default = [ "fullchain.pem" "key.pem" ]; + description = "Plugins to enable."; + }; + + extraDomains = mkOption { + default = [ ]; + type = types.listOf types.str; + description = "More domains to include in the certificate."; + example = [ "example.com" "foo.example.com:/var/www/foo" ]; + }; + }; + }; + +in + +{ + + ###### interface + + options = { + services.simp_le = { + directory = mkOption { + default = "/etc/ssl"; + type = types.str; + description = '' + Directory where certs will be stored by default. + ''; + }; + + certs = mkOption { + default = { }; + type = types.loaOf types.optionSet; + description = '' + Attribute set of certificates to get signed and renewed. + ''; + options = [ certOpts ]; + example = { + "foo.example.com" = { + webroot = "/var/www/challenges/"; + email = "foo@example.com"; + extraDomains = [ "www.example.com" "example.com" ]; + }; + "bar.example.com" = { + webroot = "/var/www/challenges/"; + email = "bar@example.com"; + }; + }; + }; + }; + }; + + ###### implementation + config = mkIf (cfg.certs != { }) { + + systemd.services = flip mapAttrs' cfg.certs (cert: data: nameValuePair + ("simp_le-${cert}") + ({ + description = "simp_le cert renewal for ${cert}"; + after = [ "network.target" ]; + serviceConfig = { + Type = "oneshot"; + SuccessExitStatus = "0 1"; + }; + preStart = '' + mkdir -p "${cfg.directory}/${cert}" + ''; + script = '' + WEBROOT="${optionalString (data.webroot == null) data.webroot}" + cd "${cfg.directory}/${cert}" + ${pkgs.simp_le}/bin/simp_le -v \ + ${concatMapStringsSep " " (p: "-f ${p}") data.plugins} \ + -d ${cert} --default_root "$WEBROOT" \ + ${concatMapStringsSep " " (p: "-d ${p}") data.extraDomains} \ + ${optionalString (data.email != null) "--email ${data.email}"} \ + --valid_min ${toString data.validMin} + ''; + }) + ); + + systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair + ("simp_le-${cert}") + ({ + description = "timer for simp_le cert renewal of ${cert}"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = data.renewInterval; + Unit = "simp_le-${cert}.service"; + }; + }) + ); + + }; + +} From adc693f982d73af6611856579234f56e383245ad Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 21:07:26 +0300 Subject: [PATCH 305/498] simp_le: 20151205 -> 20151207 --- pkgs/tools/admin/simp_le/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 5f945309aac..43e361ba647 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "simp_le-20151205"; + name = "simp_le-20151207"; src = fetchFromGitHub { owner = "kuba"; repo = "simp_le"; - rev = "976a33830759e66610970f92f6ec1a656a2c8335"; - sha256 = "0bfa5081rmjjg9sii6pn2dskd1wh0dgrf9ic9hpisawrk0y0739i"; + rev = "ac836bc0af988cb14dc0a83dc2039e7fa541b677"; + sha256 = "0r07mlis81n0pmj74wjcvjpi6i3lkzs6hz8iighhk8yymn1a8rbn"; }; - propagatedBuildInputs = with pythonPackages; [ acme cryptography pytz requests2 ]; + propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { homepage = https://github.com/kuba/simp_le; From 6906baae5c8686ac8d859b3af6083d8210c57d80 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 21:09:19 +0300 Subject: [PATCH 306/498] nixos/simp_le: improve configuration options --- nixos/modules/services/security/simp_le.nix | 101 +++++++++++++++----- 1 file changed, 77 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/services/security/simp_le.nix index d578d5bb679..927359da0d3 100644 --- a/nixos/modules/services/security/simp_le.nix +++ b/nixos/modules/services/security/simp_le.nix @@ -9,9 +9,14 @@ let certOpts = { ... }: { options = { webroot = mkOption { - type = types.nullOr types.str; - default = null; - description = "Where the webroot of the HTTP vhost is located."; + type = types.str; + description = '' + Where the webroot of the HTTP vhost is located. + .well-known/acme-challenge/ directory + will be created automatically if it doesn't exist. + http://example.org/.well-known/acme-challenge/ must also + be available (notice unencrypted HTTP). + ''; }; validMin = mkOption { @@ -32,20 +37,53 @@ let description = "Contact email address for the CA to be able to reach you."; }; + user = mkOption { + type = types.str; + default = "root"; + description = "User under which simp_le would run."; + }; + + group = mkOption { + type = types.str; + default = "root"; + description = "Group under which simp_le would run."; + }; + + postRun = mkOption { + type = types.lines; + default = ""; + example = "systemctl reload nginx.service"; + description = '' + Commands to run after certificates are re-issued. Typically + the web server and other servers using certificates need to + be reloaded. + ''; + }; + plugins = mkOption { type = types.listOf (types.enum [ "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh" - "fullchain.der" "fullchain.pem" "key.der" "key.pem" + "fullchain.der" "fullchain.pem" "key.der" "key.pem" "account_key.json" ]); - default = [ "fullchain.pem" "key.pem" ]; - description = "Plugins to enable."; + default = [ "fullchain.pem" "key.pem" "account_key.json" ]; + description = '' + Plugins to enable. With default settings simp_le will + store public certificate bundle in fullchain.pem + and private key in key.pem in its state directory. + ''; }; extraDomains = mkOption { - default = [ ]; - type = types.listOf types.str; - description = "More domains to include in the certificate."; - example = [ "example.com" "foo.example.com:/var/www/foo" ]; + type = types.attrsOf (types.nullOr types.str); + default = {}; + example = { + "example.org" = "/srv/http/nginx"; + "mydomain.org" = null; + }; + description = '' + Extra domain names for which certificates are to be issued, with their + own server roots if needed. + ''; }; }; }; @@ -62,7 +100,7 @@ in default = "/etc/ssl"; type = types.str; description = '' - Directory where certs will be stored by default. + Directory where certs and other state will be stored by default. ''; }; @@ -74,10 +112,10 @@ in ''; options = [ certOpts ]; example = { - "foo.example.com" = { + "example.com" = { webroot = "/var/www/challenges/"; email = "foo@example.com"; - extraDomains = [ "www.example.com" "example.com" ]; + extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; }; }; "bar.example.com" = { webroot = "/var/www/challenges/"; @@ -91,27 +129,42 @@ in ###### implementation config = mkIf (cfg.certs != { }) { - systemd.services = flip mapAttrs' cfg.certs (cert: data: nameValuePair + systemd.services = flip mapAttrs' cfg.certs (cert: data: + let + cpath = "${cfg.directory}/${cert}"; + cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" data.validMin ] + ++ optionals (data.email != null) [ "--email" data.email ] + ++ concatMap (p: [ "-f" p ]) data.plugins + ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); + + in nameValuePair ("simp_le-${cert}") ({ description = "simp_le cert renewal for ${cert}"; after = [ "network.target" ]; serviceConfig = { Type = "oneshot"; - SuccessExitStatus = "0 1"; + SuccessExitStatus = [ "0" "1" ]; }; + path = [ pkgs.simp_le pkgs.sudo ]; preStart = '' - mkdir -p "${cfg.directory}/${cert}" + mkdir -p '${cfg.directory}' + if [ ! -d '${cpath}' ]; then + mkdir -m 700 '${cpath}' + chown '${data.user}:${data.group}' '${cpath}' + fi ''; script = '' - WEBROOT="${optionalString (data.webroot == null) data.webroot}" - cd "${cfg.directory}/${cert}" - ${pkgs.simp_le}/bin/simp_le -v \ - ${concatMapStringsSep " " (p: "-f ${p}") data.plugins} \ - -d ${cert} --default_root "$WEBROOT" \ - ${concatMapStringsSep " " (p: "-d ${p}") data.extraDomains} \ - ${optionalString (data.email != null) "--email ${data.email}"} \ - --valid_min ${toString data.validMin} + cd '${cpath}' + set +e + sudo -u '${data.user}' -- simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} + EXITCODE=$? + set -e + if [ "$EXITCODE" = "0" ]; then + ${data.postRun} + else + exit "$EXITCODE" + fi ''; }) ); From 1641c19d0b367ebe9eca15f269c9f8dbf020c113 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 8 Dec 2015 21:23:09 +0300 Subject: [PATCH 307/498] nixos/simp_le: use /var/lib/simp_le as root dir by default /etc on NixOS is regenerated on boot and there was movement towards making it read-only -- so let's keep dynamic state elsewhere. --- nixos/modules/services/security/simp_le.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/services/security/simp_le.nix index 927359da0d3..31eb89da55c 100644 --- a/nixos/modules/services/security/simp_le.nix +++ b/nixos/modules/services/security/simp_le.nix @@ -97,7 +97,7 @@ in options = { services.simp_le = { directory = mkOption { - default = "/etc/ssl"; + default = "/var/lib/simp_le"; type = types.str; description = '' Directory where certs and other state will be stored by default. From e7362a877dd11493d23dcbbee390343b64c0a491 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Dec 2015 17:30:45 +0100 Subject: [PATCH 308/498] nixos/simp_le: Use systemd for setting user and group This is much cleaner and we don't depend on sudo. --- nixos/modules/services/security/simp_le.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/services/security/simp_le.nix index 31eb89da55c..12d9f970816 100644 --- a/nixos/modules/services/security/simp_le.nix +++ b/nixos/modules/services/security/simp_le.nix @@ -145,8 +145,12 @@ in serviceConfig = { Type = "oneshot"; SuccessExitStatus = [ "0" "1" ]; + PermissionsStartOnly = true; + User = data.user; + Group = data.group; + PrivateTmp = true; }; - path = [ pkgs.simp_le pkgs.sudo ]; + path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' if [ ! -d '${cpath}' ]; then @@ -157,13 +161,16 @@ in script = '' cd '${cpath}' set +e - sudo -u '${data.user}' -- simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} + simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} EXITCODE=$? set -e - if [ "$EXITCODE" = "0" ]; then + echo "$EXITCODE" > /tmp/lastExitCode + exit "$EXITCODE" + ''; + postStop = '' + if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then + echo "Executing postRun hook..." ${data.postRun} - else - exit "$EXITCODE" fi ''; }) From de24b00d41d6a80ccae0adecc3557c7c7154aa22 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Dec 2015 17:42:17 +0100 Subject: [PATCH 309/498] nixos/simp_le: Rename to security.acme --- nixos/modules/module-list.nix | 2 +- .../simp_le.nix => security/acme.nix} | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) rename nixos/modules/{services/security/simp_le.nix => security/acme.nix} (92%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c708f095f40..039b562b6f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -80,6 +80,7 @@ ./programs/xfs_quota.nix ./programs/zsh/zsh.nix ./rename.nix + ./security/acme.nix ./security/apparmor.nix ./security/apparmor-suid.nix ./security/ca.nix @@ -388,7 +389,6 @@ ./services/security/hologram.nix ./services/security/munge.nix ./services/security/physlock.nix - ./services/security/simp_le.nix ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/security/acme.nix similarity index 92% rename from nixos/modules/services/security/simp_le.nix rename to nixos/modules/security/acme.nix index 12d9f970816..72eac82defa 100644 --- a/nixos/modules/services/security/simp_le.nix +++ b/nixos/modules/security/acme.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.services.simp_le; + cfg = config.security.acme; certOpts = { ... }: { options = { @@ -40,13 +40,13 @@ let user = mkOption { type = types.str; default = "root"; - description = "User under which simp_le would run."; + description = "User running the ACME client."; }; group = mkOption { type = types.str; default = "root"; - description = "Group under which simp_le would run."; + description = "Group running the ACME client."; }; postRun = mkOption { @@ -95,9 +95,9 @@ in ###### interface options = { - services.simp_le = { + security.acme = { directory = mkOption { - default = "/var/lib/simp_le"; + default = "/var/lib/acme"; type = types.str; description = '' Directory where certs and other state will be stored by default. @@ -138,9 +138,9 @@ in ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); in nameValuePair - ("simp_le-${cert}") + ("acme-${cert}") ({ - description = "simp_le cert renewal for ${cert}"; + description = "ACME cert renewal for ${cert} using simp_le"; after = [ "network.target" ]; serviceConfig = { Type = "oneshot"; @@ -177,13 +177,13 @@ in ); systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair - ("simp_le-${cert}") + ("acme-${cert}") ({ - description = "timer for simp_le cert renewal of ${cert}"; + description = "timer for ACME cert renewal of ${cert}"; wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = data.renewInterval; - Unit = "simp_le-${cert}.service"; + Unit = "acme-simp_le-${cert}.service"; }; }) ); From 0517d59a66f613471f478d0497aa5adb5dccfcdc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Dec 2015 14:19:56 +0100 Subject: [PATCH 310/498] nixos/acme: Improve documentation --- nixos/modules/security/acme.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 72eac82defa..37e4c287623 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -21,14 +21,18 @@ let validMin = mkOption { type = types.int; - default = 2592000; + default = 30 * 24 * 3600; description = "Minimum remaining validity before renewal in seconds."; }; renewInterval = mkOption { type = types.str; default = "weekly"; - description = "Systemd calendar expression when to check for renewal. See systemd.time(7)."; + description = '' + Systemd calendar expression when to check for renewal. See + systemd.time + 5. + ''; }; email = mkOption { From 9374ddb89523f6d77951445c5224b464d9ec198c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Dec 2015 14:21:44 +0100 Subject: [PATCH 311/498] nixos/acme: validMin & renewInterval aren't cert-specific --- nixos/modules/security/acme.nix | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 37e4c287623..37de46cb1a5 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -19,22 +19,6 @@ let ''; }; - validMin = mkOption { - type = types.int; - default = 30 * 24 * 3600; - description = "Minimum remaining validity before renewal in seconds."; - }; - - renewInterval = mkOption { - type = types.str; - default = "weekly"; - description = '' - Systemd calendar expression when to check for renewal. See - systemd.time - 5. - ''; - }; - email = mkOption { type = types.nullOr types.str; default = null; @@ -108,6 +92,22 @@ in ''; }; + validMin = mkOption { + type = types.int; + default = 30 * 24 * 3600; + description = "Minimum remaining validity before renewal in seconds."; + }; + + renewInterval = mkOption { + type = types.str; + default = "weekly"; + description = '' + Systemd calendar expression when to check for renewal. See + systemd.time + 5. + ''; + }; + certs = mkOption { default = { }; type = types.loaOf types.optionSet; @@ -136,7 +136,7 @@ in systemd.services = flip mapAttrs' cfg.certs (cert: data: let cpath = "${cfg.directory}/${cert}"; - cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" data.validMin ] + cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); @@ -186,7 +186,7 @@ in description = "timer for ACME cert renewal of ${cert}"; wantedBy = [ "timers.target" ]; timerConfig = { - OnCalendar = data.renewInterval; + OnCalendar = cfg.renewInterval; Unit = "acme-simp_le-${cert}.service"; }; }) From 1685b9d06ebe93eaaed478bde02db813fc39e4b2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Dec 2015 16:06:24 +0100 Subject: [PATCH 312/498] nixos/acme: Add module documentation --- .../manual/configuration/configuration.xml | 1 + nixos/doc/manual/default.nix | 1 + nixos/modules/security/acme.nix | 121 +++++++++--------- nixos/modules/security/acme.xml | 69 ++++++++++ 4 files changed, 134 insertions(+), 58 deletions(-) create mode 100644 nixos/modules/security/acme.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index afffd60bc48..1e488b59343 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -26,6 +26,7 @@ effect after you run nixos-rebuild. + diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 844cba57cd8..bd558dac971 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -55,6 +55,7 @@ let cp -prd $sources/* . # */ chmod -R u+w . cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml + cp ${../../modules/security/acme.xml} configuration/acme.xml cp ${../../modules/misc/nixos.xml} configuration/nixos.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 37de46cb1a5..8f3a2ee073b 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -131,67 +131,72 @@ in }; ###### implementation - config = mkIf (cfg.certs != { }) { + config = mkMerge [ + (mkIf (cfg.certs != { }) { - systemd.services = flip mapAttrs' cfg.certs (cert: data: - let - cpath = "${cfg.directory}/${cert}"; - cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ] - ++ optionals (data.email != null) [ "--email" data.email ] - ++ concatMap (p: [ "-f" p ]) data.plugins - ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); + systemd.services = flip mapAttrs' cfg.certs (cert: data: + let + cpath = "${cfg.directory}/${cert}"; + cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ] + ++ optionals (data.email != null) [ "--email" data.email ] + ++ concatMap (p: [ "-f" p ]) data.plugins + ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); - in nameValuePair - ("acme-${cert}") - ({ - description = "ACME cert renewal for ${cert} using simp_le"; - after = [ "network.target" ]; - serviceConfig = { - Type = "oneshot"; - SuccessExitStatus = [ "0" "1" ]; - PermissionsStartOnly = true; - User = data.user; - Group = data.group; - PrivateTmp = true; - }; - path = [ pkgs.simp_le ]; - preStart = '' - mkdir -p '${cfg.directory}' - if [ ! -d '${cpath}' ]; then - mkdir -m 700 '${cpath}' - chown '${data.user}:${data.group}' '${cpath}' - fi - ''; - script = '' - cd '${cpath}' - set +e - simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} - EXITCODE=$? - set -e - echo "$EXITCODE" > /tmp/lastExitCode - exit "$EXITCODE" - ''; - postStop = '' - if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then - echo "Executing postRun hook..." - ${data.postRun} - fi - ''; - }) - ); + in nameValuePair + ("acme-${cert}") + ({ + description = "ACME cert renewal for ${cert} using simp_le"; + after = [ "network.target" ]; + serviceConfig = { + Type = "oneshot"; + SuccessExitStatus = [ "0" "1" ]; + PermissionsStartOnly = true; + User = data.user; + Group = data.group; + PrivateTmp = true; + }; + path = [ pkgs.simp_le ]; + preStart = '' + mkdir -p '${cfg.directory}' + if [ ! -d '${cpath}' ]; then + mkdir -m 700 '${cpath}' + chown '${data.user}:${data.group}' '${cpath}' + fi + ''; + script = '' + cd '${cpath}' + set +e + simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline} + EXITCODE=$? + set -e + echo "$EXITCODE" > /tmp/lastExitCode + exit "$EXITCODE" + ''; + postStop = '' + if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then + echo "Executing postRun hook..." + ${data.postRun} + fi + ''; + }) + ); - systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair - ("acme-${cert}") - ({ - description = "timer for ACME cert renewal of ${cert}"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = cfg.renewInterval; - Unit = "acme-simp_le-${cert}.service"; - }; - }) - ); + systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair + ("acme-${cert}") + ({ + description = "timer for ACME cert renewal of ${cert}"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.renewInterval; + Unit = "acme-simp_le-${cert}.service"; + }; + }) + ); + }) - }; + { meta.maintainers = with lib.maintainers; [ abbradar fpletz globin ]; + meta.doc = ./acme.xml; + } + ]; } diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml new file mode 100644 index 00000000000..e32fa72c939 --- /dev/null +++ b/nixos/modules/security/acme.xml @@ -0,0 +1,69 @@ + + +SSL/TLS Certificates with ACME + +NixOS supports automatic domain validation & certificate +retrieval and renewal using the ACME protocol. This is currently only +implemented by and for Let's Encrypt. The alternative ACME client +simp_le is used under the hood. + +
Prerequisites + +You need to have a running HTTP server for verification. The server must +have a webroot defined that can serve +.well-known/acme-challenge. This directory must be +writeable by the user that will run the ACME client. + +For instance, this generic snippet could be used for Nginx: + + +http { + server { + server_name _; + listen 80; + listen [::]:80; + + location /.well-known/acme-challenge { + root /var/www/challenges; + } + + location / { + return 301 https://$host$request_uri; + } + } +} + + + +
+ +
Configuring + +To enable ACME certificate retrieval & renewal for a certificate for +foo.example.com, add the following in your +configuration.nix: + + +security.acme.certs."foo.example.com" = { + webroot = "/var/www/challenges"; + email = "foo@example.com"; +}; + + + +The private key key.pem and certificate +fullchain.pem will be put into +/var/lib/acme/foo.example.com. The target directory can +be configured with the option security.acme.directory. + + +Refer to for all available configuration +options for the security.acme module. + +
+ + From 492541c37840978886d357125bf260e5cf3e8246 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Dec 2015 17:01:23 +0100 Subject: [PATCH 313/498] miniupnpd 1.9.20150721 -> 1.9.20151212 Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 0d852573eab..91306b4ae6d 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.9.20150721"; + name = "miniupnpd-1.9.20151212"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0w2422wfcir333qd300swkdvmksdfdllspplnz8vbv13a1724h4k"; + sha256 = "1ay7dw1y5fqgjrqa9s8av8ndmw7wkjm39xnnzzw8pxbv70d6b12j"; name = "${name}.tar.gz"; }; From 19aa4f0a6b10b980b7705d3aaf1a10156658bcea Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 12 Dec 2015 17:38:45 +0100 Subject: [PATCH 314/498] pixz: init at 1.0.6 --- pkgs/tools/compression/pixz/default.nix | 36 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/compression/pixz/default.nix diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix new file mode 100644 index 00000000000..8572221572c --- /dev/null +++ b/pkgs/tools/compression/pixz/default.nix @@ -0,0 +1,36 @@ +{ + stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig + , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xml_xslt + , libarchive, lzma +}: +stdenv.mkDerivation rec { + baseName = "pixz"; + version = "1.0.6"; + name = "${baseName}-${version}"; + + buildInputs = [ + autoconf automake libtool pkgconfig asciidoc libxslt libxml2 + docbook_xml_dtd_45 docbook_xml_xslt + libarchive lzma + ]; + preBuild = '' + echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" + ''; + src = fetchFromGitHub { + owner = "vasi"; + repo = baseName; + rev = "v${version}"; + sha256 = "0q61wqg2yxrgd4nc7256mf7izp92is29ll3rax1cxr6fj9jrd8b7"; + }; + preConfigure = '' + ./autogen.sh + ''; + + meta = { + inherit version; + description = ''A parallel compressor/decompressor for xz format''; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d98c327f8f..61b4278f0fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1814,6 +1814,8 @@ let pgf_graphics = callPackage ../tools/graphics/pgf { }; pigz = callPackage ../tools/compression/pigz { }; + + pixz = callPackage ../tools/compression/pixz { }; pxz = callPackage ../tools/compression/pxz { }; From 269ae2e29d1e25b98d6491fc0b5e14d0521c12b2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 10:47:03 -0600 Subject: [PATCH 315/498] gnuplot: use texlive-new --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f8dd35576ff..8a9df4982a3 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline -, withTeXLive ? false, texLive +, withTeXLive ? false, texlive , withLua ? false, lua , emacs ? null , libX11 ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] - ++ lib.optional withTeXLive texLive + ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optional withQt [ qt ] From f7edf63b23e25305fbe6c77d75a87fba7891beb5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 10:57:38 -0600 Subject: [PATCH 316/498] ipe: use texlive-new --- pkgs/applications/graphics/ipe/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 9f1f53abc5c..c1c1861cd3d 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX +{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript , libjpeg, qtbase -, makeWrapper }: -let ghostscript = ghostscriptX; in +, makeQtWrapper +}: + stdenv.mkDerivation rec { name = "ipe-7.1.10"; @@ -21,16 +22,18 @@ stdenv.mkDerivation rec { ''; IPEPREFIX="$$out"; - URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/"; + URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper + libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript ]; - postInstall = '' + nativeBuildInputs = [ makeQtWrapper ]; + + postFixup = '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : "${texLive}/bin" + wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 922ef1d676f..6c021b858e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12165,7 +12165,10 @@ let lua = lua5; }; - ipe = qt5Libs.callPackage ../applications/graphics/ipe { }; + ipe = qt5Libs.callPackage ../applications/graphics/ipe { + ghostscript = ghostscriptX; + texlive = texlive.combine { inherit (texlive) scheme-small; }; + }; iptraf = callPackage ../applications/networking/iptraf { }; From b07fa98f82ac44801dc34b6b143048ee28f7e1a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 11:31:26 -0600 Subject: [PATCH 317/498] nixos/sddm: add setupScript and stopScript options These options allow setting the start and stop scripts for the display manager. Making these configurable is necessary to allow some hardware configurations. Upstream ships empty scripts by default, anyway. --- .../services/x11/display-managers/sddm.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index d156f692f26..50e6a85b4f2 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -17,6 +17,16 @@ let exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" ''; + Xsetup = pkgs.writeScript "Xsetup" '' + #!/bin/sh + ${cfg.setupScript} + ''; + + Xstop = pkgs.writeScript "Xstop" '' + #!/bin/sh + ${cfg.stopScript} + ''; + cfgFile = pkgs.writeText "sddm.conf" '' [General] HaltCommand=${pkgs.systemd}/bin/systemctl poweroff @@ -39,6 +49,8 @@ let SessionCommand=${dmcfg.session.script} SessionDir=${dmcfg.session.desktops} XauthPath=${pkgs.xorg.xauth}/bin/xauth + DisplayCommand=${Xsetup} + DisplayStopCommand=${Xstop} ${optionalString cfg.autoLogin.enable '' [Autologin] @@ -98,6 +110,27 @@ in ''; }; + setupScript = mkOption { + type = types.str; + default = ""; + example = '' + # workaround for using NVIDIA Optimus without Bumblebee + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + ''; + description = '' + A script to execute when starting the display server. + ''; + }; + + stopScript = mkOption { + type = types.str; + default = ""; + description = '' + A script to execute when stopping the display server. + ''; + }; + autoLogin = mkOption { default = {}; description = '' From 73a9826001873ae5dc861fc086d6265cadf9e3e4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 11:32:20 -0600 Subject: [PATCH 318/498] sddm: don't install empty scripts --- pkgs/applications/display-managers/sddm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index d2faf465106..b7bf5ee5664 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -45,6 +45,11 @@ let enableParallelBuilding = true; + postInstall = '' + # remove empty scripts + rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" + ''; + meta = with stdenv.lib; { description = "QML based X11 display manager"; homepage = https://github.com/sddm/sddm; From fac138a2f5a784694b652f7f1f8767e7882d542c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 11:33:39 -0600 Subject: [PATCH 319/498] nixos/sddm: fix indentation --- .../modules/services/x11/display-managers/sddm.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 50e6a85b4f2..bcac83aa738 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -138,7 +138,7 @@ in ''; type = types.submodule { - options = { + options = { enable = mkOption { type = types.bool; default = false; @@ -163,7 +163,7 @@ in will work only the first time. ''; }; - }; + }; }; }; @@ -175,14 +175,16 @@ in assertions = [ { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; - message = "SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set"; + message = '' + SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set + ''; } { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names; message = '' SDDM auto-login requires that services.xserver.desktopManager.default and - services.xserver.windowMananger.default are set to valid values. The current - default session: ${defaultSessionName} is not valid. - ''; + services.xserver.windowMananger.default are set to valid values. The current + default session: ${defaultSessionName} is not valid. + ''; } ]; From 8da384edad4e6434b5aff34a88de149ff2928c38 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 12 Dec 2015 19:36:08 +0100 Subject: [PATCH 320/498] virt-manager: 1.2.1 -> 1.3.1 --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 0d54489a189..d22072f1095 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,12 +9,12 @@ with pythonPackages; buildPythonPackage rec { name = "virt-manager-${version}"; - version = "1.2.1"; + version = "1.3.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1gp6ijrwl6kjs54l395002pc9sblp08p4nqx9zcb9qg5f87aifvl"; + sha256 = "0lqd9ix7k4jswqzxarnvxfbq6rvpcm8rrc1if86nw67ms1dh2i36"; }; propagatedBuildInputs = From 6734127545570274acefbabd5c6259822f231a24 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Nov 2015 02:44:56 +0100 Subject: [PATCH 321/498] shairport-sync service: add module Adds a new service module for shairport-sync. Tested with a local and remote pulseaudio server. Needs to be run as a user in the pulse group to access pulseaudio. --- nixos/modules/module-list.nix | 1 + .../services/networking/shairport-sync.nix | 80 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 nixos/modules/services/networking/shairport-sync.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 963daf721ad..9b25f998400 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -343,6 +343,7 @@ ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/skydns.nix + ./services/networking/shairport-sync.nix ./services/networking/shout.nix ./services/networking/softether.nix ./services/networking/spiped.nix diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix new file mode 100644 index 00000000000..a523e66d09b --- /dev/null +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.shairport-sync; + +in + +{ + + ###### interface + + options = { + + services.shairport-sync = { + + enable = mkOption { + default = false; + description = '' + Enable the shairport-sync daemon. + + Running with a local system-wide or remote pulseaudio server + is recommended. + ''; + }; + + arguments = mkOption { + default = "-v -o pulse"; + description = '' + Arguments to pass to the daemon. Defaults to a local pulseaudio + server. + ''; + }; + + user = mkOption { + default = "shairport"; + description = '' + User account name under which to run shairport-sync. The account + will be created. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.shairport-sync.enable { + + services.avahi.enable = true; + + users.extraUsers = singleton + { name = cfg.user; + description = "Shairport user"; + isSystemUser = true; + createHome = true; + home = "/var/lib/shairport-sync"; + extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse"; + }; + + systemd.services.shairport-sync = + { + description = "shairport-sync"; + after = [ "network.target" "avahi-daemon.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}"; + }; + }; + + environment.systemPackages = [ pkgs.shairport-sync ]; + + }; + +} From b6776d41dd45c9bc1be80c4a5d99b16ce2fde77d Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sat, 12 Dec 2015 21:32:59 +0200 Subject: [PATCH 322/498] zc.buildout-nix: 2.4.3 -> 2.5.0 --- pkgs/development/python-modules/buildout-nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 001aebc1029..d12702d98ca 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, buildPythonPackage }: buildPythonPackage { - name = "zc.buildout-nix-2.4.3"; + name = "zc.buildout-nix-2.5.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.4.3.tar.gz"; - sha256 = "db877d791e058a6207ac716e1017296e6862e4f1b5388dd145702eb19d902580"; + url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.5.0.tar.gz"; + sha256 = "721bd2231a9f01f2d5c14f3adccb3385f85b093ee05b18d15d0ff2b9f1f1bd02"; }; patches = [ ./nix.patch ]; From 8f1c4b4dde202b14005249db1880cccd7f4cf128 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Dec 2015 21:04:16 +0100 Subject: [PATCH 323/498] python tqdm: init at 3.1.4 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fab1d41bcc7..29d6773c015 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18722,6 +18722,31 @@ in modules // { }; }; + tqdm = buildPythonPackage rec { + name = "tqdm-${version}"; + version = "3.1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/tqdm/${name}.tar.gz"; + sha256 = "e2dbef0df0fd24c9ae3b2e07bef2a3607ad8431142e76d3294a5a11926d214bf"; + }; + + buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ]; + propagatedBuildInputs = with self; [ matplotlib pandas ]; + + preBuild = '' + export LC_ALL="en_US.UTF-8" + ''; + + doCheck = !(isPy27); # Performance test fails + + meta = { + description = "A Fast, Extensible Progress Meter"; + homepage = https://github.com/tqdm/tqdm; + license = with licenses; [ mit ]; + }; + }; + smmap = buildPythonPackage rec { name = "smmap-0.9.0"; disabled = isPyPy; # This fails the tests if built with pypy From 9f71bba8a482bfd6347f50423f04bae908c78d16 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sat, 12 Dec 2015 12:24:21 -0800 Subject: [PATCH 324/498] libb64: init at 1.2 --- pkgs/development/libraries/libb64/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libb64/default.nix diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix new file mode 100644 index 00000000000..793c4992c3f --- /dev/null +++ b/pkgs/development/libraries/libb64/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libb64-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://download.draios.com/dependencies/libb64-1.2.src.zip"; + md5 = "a609809408327117e2c643bed91b76c5"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out $out/lib $out/bin $out/include + cp -r include/* $out/include/ + cp base64/base64 $out/bin/ + cp src/libb64.a src/cencode.o src/cdecode.o $out/lib/ + ''; + + meta = { + inherit version; + description = "ANSI C routines for fast base64 encoding/decoding"; + license = stdenv.lib.licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acd586706c..c728843286b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6837,6 +6837,8 @@ let libjson = callPackage ../development/libraries/libjson { }; + libb64 = callPackage ../development/libraries/libb64 { }; + judy = callPackage ../development/libraries/judy { }; keybinder = callPackage ../development/libraries/keybinder { @@ -8329,7 +8331,7 @@ let rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; - + sad = callPackage ../applications/science/logic/sad { }; sbc = callPackage ../development/libraries/sbc { }; From 229f0ac257f430d92c7bbf46b4b3d139fbc039ee Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sat, 12 Dec 2015 12:25:17 -0800 Subject: [PATCH 325/498] sysdig: 0.1.102 -> 0.5.1 --- pkgs/os-specific/linux/sysdig/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index e2758e7c2b6..5c15ba1a9ce 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}: +{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}: let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.102"; + version = "0.5.1"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0"; + sha256 = "08wnk0593ljdq466hk0npsjc0gbm37nsjm1x2ilsf58n1xl8dmfs"; }; buildInputs = [ - cmake zlib luajit ncurses + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl ]; in stdenv.mkDerivation { @@ -20,9 +20,7 @@ stdenv.mkDerivation { }; cmakeFlags = [ - "-DUSE_BUNDLED_LUAJIT=OFF" - "-DUSE_BUNDLED_ZLIB=OFF" - "-DUSE_BUNDLED_NCURSES=OFF" + "-DUSE_BUNDLED_DEPS=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; preConfigure = '' export INSTALL_MOD_PATH="$out" From d6e3a8e921040dedba39adb4ba047465284d6d7b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 14:32:47 -0600 Subject: [PATCH 326/498] nixos/kde5: enable SVG icons in GTK programs Fixes #10758. --- nixos/modules/services/x11/desktop-managers/kde5.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 0f3cb5735e7..06fc622325f 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -166,6 +166,11 @@ in GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ]; }; + # Enable GTK applications to load SVG icons + environment.variables = mkIf (lib.hasAttr "breeze-icons" kf5) { + GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; + }; + fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ]; programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; From bce4e95a80f9d67ad732cb0fd2b337c1576ff27b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 17:21:48 -0600 Subject: [PATCH 327/498] kdeApps_15_12: 15.11.80 -> 15.11.90 --- pkgs/applications/kde-apps-15.12/fetchsrcs.sh | 2 +- pkgs/applications/kde-apps-15.12/srcs.nix | 1920 ++++++++--------- 2 files changed, 961 insertions(+), 961 deletions(-) diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh index a5d568a2b6f..334d94a5e47 100755 --- a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh +++ b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/unstable/applications/15.11.80/ -A *.tar.xz' +WGET_ARGS='http://download.kde.org/unstable/applications/15.11.90/ -A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/applications/kde-apps-15.12/srcs.nix index ffd12f9e242..d6eaf208b4b 100644 --- a/pkgs/applications/kde-apps-15.12/srcs.nix +++ b/pkgs/applications/kde-apps-15.12/srcs.nix @@ -3,1923 +3,1923 @@ { akonadi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/akonadi-15.11.80.tar.xz"; - sha256 = "02a4j9ydxqvjv5kpp8nlw7j0jil0ryqrv39ibypcfm73hx09xxkn"; - name = "akonadi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/akonadi-15.11.90.tar.xz"; + sha256 = "09frr1chl0lh135lh43i8fnjjw4d06npafwnvzbd0rv0gzvl89sv"; + name = "akonadi-15.11.90.tar.xz"; }; }; akonadi-calendar = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/akonadi-calendar-15.11.80.tar.xz"; - sha256 = "1cdyv10gfc5ygiz726vxzr17s6bk28bla7z8vidn9nkh922wn3k4"; - name = "akonadi-calendar-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/akonadi-calendar-15.11.90.tar.xz"; + sha256 = "0wh6f9pxl23jqgjsx0gglk4vfqy9qi9572jggqwl80j0jbzr8686"; + name = "akonadi-calendar-15.11.90.tar.xz"; }; }; akonadi-search = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/akonadi-search-15.11.80.tar.xz"; - sha256 = "0749i1hqwyn4l12039vq2ckm72p9ajcmr9mljsn9vcil9cvd8g82"; - name = "akonadi-search-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/akonadi-search-15.11.90.tar.xz"; + sha256 = "16l9v2g2ll5dsg2skhdgprdmk57696py6llm4i1r4hj7v2xz9k9g"; + name = "akonadi-search-15.11.90.tar.xz"; }; }; analitza = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/analitza-15.11.80.tar.xz"; - sha256 = "1x8l71acmg2fswwlc4pci6681nz7r1qsvbcfdw3alq76l28zmrhp"; - name = "analitza-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/analitza-15.11.90.tar.xz"; + sha256 = "101kbgw8rg5ic8033pch5z4fcirb1vzyqxa4rwflh9w3i5bkgy2c"; + name = "analitza-15.11.90.tar.xz"; }; }; ark = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ark-15.11.80.tar.xz"; - sha256 = "1sj6mkzxy4gw19yclps5jn54780is5vpr526bvmbsa2vgj8njxcw"; - name = "ark-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ark-15.11.90.tar.xz"; + sha256 = "1mccm69rqzcl9zw632fgkyb248r9c9d915yyl2lv28f873m2awai"; + name = "ark-15.11.90.tar.xz"; }; }; artikulate = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/artikulate-15.11.80.tar.xz"; - sha256 = "0qxykga1kyc6viyqdsqngfvnrf0wk81h54ybrlq3bgkirnfmng07"; - name = "artikulate-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/artikulate-15.11.90.tar.xz"; + sha256 = "16c6a7cm22nqnjjs1py6h031nkca7axnq1ipv14fwdwanz5mra6r"; + name = "artikulate-15.11.90.tar.xz"; }; }; audiocd-kio = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/audiocd-kio-15.11.80.tar.xz"; - sha256 = "0l4x2gm1f6qwzvdq57h0z1zw1qkg7dah5zb2gpjz6apggw4iah00"; - name = "audiocd-kio-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/audiocd-kio-15.11.90.tar.xz"; + sha256 = "0vkb03hc4p3h60w138xi44jsw35hji27lkm9isi544375kcimd6b"; + name = "audiocd-kio-15.11.90.tar.xz"; }; }; baloo-widgets = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/baloo-widgets-15.11.80.tar.xz"; - sha256 = "11wf2gf64dd8xxyk32kviyxki8f0ddg86nzw5g19l9drspils6jh"; - name = "baloo-widgets-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/baloo-widgets-15.11.90.tar.xz"; + sha256 = "168ld1376fh4q2g3fg1mc22j3bnsw5pc644lffcl1rsfkk6gnigi"; + name = "baloo-widgets-15.11.90.tar.xz"; }; }; blinken = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/blinken-15.11.80.tar.xz"; - sha256 = "1lib5mq4xy8xphxfa3ljcdzqp1kd08f1zc7ch6sfb124dv9yzpln"; - name = "blinken-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/blinken-15.11.90.tar.xz"; + sha256 = "1y26azmasnx9430iflwmafzyjn9z1q1fqrd2hyy42chkgfgzzf08"; + name = "blinken-15.11.90.tar.xz"; }; }; bomber = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/bomber-15.11.80.tar.xz"; - sha256 = "1rldcx532llxy22y6r1lvz6y8zh66mby5in59snzp5gv1bj6aq89"; - name = "bomber-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/bomber-15.11.90.tar.xz"; + sha256 = "13h65alwrnq7g7d1fhh49rixlkpyffbgxzkxdf789lc1kfpjg456"; + name = "bomber-15.11.90.tar.xz"; }; }; bovo = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/bovo-15.11.80.tar.xz"; - sha256 = "1ypna943rq6sidx2zc23r8mm61jfhsc28bdi74v1qg4ishpsjls9"; - name = "bovo-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/bovo-15.11.90.tar.xz"; + sha256 = "1yrlrdakn98vlgcrv71n5gqm9w0h7hxsdn1zz44292kklky0960f"; + name = "bovo-15.11.90.tar.xz"; }; }; cantor = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/cantor-15.11.80.tar.xz"; - sha256 = "0pfksygz9ng1c4vf3wfnw6w9dfr133hn7xnfdd2vymqh6bws8b34"; - name = "cantor-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/cantor-15.11.90.tar.xz"; + sha256 = "17dg35303mfz91mhgzysxifddwrlc69p9k0mhzasq64i5vmhz8pk"; + name = "cantor-15.11.90.tar.xz"; }; }; cervisia = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/cervisia-15.11.80.tar.xz"; - sha256 = "0hrbxd3db71kcnvjv64184c3cqankzdnfyfjj4ar1sznvvl29836"; - name = "cervisia-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/cervisia-15.11.90.tar.xz"; + sha256 = "0ksxahl6lv3lqqdvkir9b1lkqg3j3y0yfr08ac0ib5v61cb6lfgp"; + name = "cervisia-15.11.90.tar.xz"; }; }; dolphin = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/dolphin-15.11.80.tar.xz"; - sha256 = "1c7i3akafqhrrv6aq992fl9a9ki2mgs6y9cd6ha320x6npl1f1rj"; - name = "dolphin-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/dolphin-15.11.90.tar.xz"; + sha256 = "1w05cb1kc29f48p5spwwxx6fksd3mn6mc43n7hp8r0abkybibpgk"; + name = "dolphin-15.11.90.tar.xz"; }; }; dolphin-plugins = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/dolphin-plugins-15.11.80.tar.xz"; - sha256 = "0vn02bjwch54cg1rfrad12g773r3slhdnl9kpfy1kgjra5p2vdm9"; - name = "dolphin-plugins-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/dolphin-plugins-15.11.90.tar.xz"; + sha256 = "0940mhj9v0g8b0rbkp70x6vrxk1pdhj67hv73dab63m3i2yfn4hh"; + name = "dolphin-plugins-15.11.90.tar.xz"; }; }; dragon = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/dragon-15.11.80.tar.xz"; - sha256 = "1vv8kxrz2444n8ffi4vq99vi7a64ywbhmy4dx6k055hzpcmh5005"; - name = "dragon-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/dragon-15.11.90.tar.xz"; + sha256 = "1znj06dkcgqs66z9magc2i5shrv9zvsw6lrvva3sh0pvv7mw3v76"; + name = "dragon-15.11.90.tar.xz"; }; }; ffmpegthumbs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ffmpegthumbs-15.11.80.tar.xz"; - sha256 = "0zcaz96rd178w22cqmlay3iq2gb3j6snyy2fd0x4xnzmhmwnvxm6"; - name = "ffmpegthumbs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ffmpegthumbs-15.11.90.tar.xz"; + sha256 = "1q2iqk6pkv8whk82q8rvpd5dknjki0dnmg72q147pgrvi5aajrvi"; + name = "ffmpegthumbs-15.11.90.tar.xz"; }; }; filelight = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/filelight-15.11.80.tar.xz"; - sha256 = "0i2iwrq83j2jv4kw3nakiprxdk8i9zk700pvcm9p89ls2h91gv0k"; - name = "filelight-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/filelight-15.11.90.tar.xz"; + sha256 = "0xkrd92a26rd5s471s451dwr71rw9dyzp305h2lmg9ay6bhhjf9g"; + name = "filelight-15.11.90.tar.xz"; }; }; gpgmepp = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/gpgmepp-15.11.80.tar.xz"; - sha256 = "14igg9kpkv1762q9jjzdc3289swj5l2a21q9xj3smabf7b3mzm3d"; - name = "gpgmepp-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/gpgmepp-15.11.90.tar.xz"; + sha256 = "1ygxa6miynlvc4ig08dqnrmwrv0jwl18yxa3v6i20xy1qjnpbw9w"; + name = "gpgmepp-15.11.90.tar.xz"; }; }; granatier = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/granatier-15.11.80.tar.xz"; - sha256 = "11rsgjl9fkdhwwmszj3sx97mmrks77qhj9zfwb4rgd67q6q8vrzm"; - name = "granatier-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/granatier-15.11.90.tar.xz"; + sha256 = "1vxf9qw8y1gxjs5lpjk4439qxglgdb8wx3hlygx6a71p2vg0qgdx"; + name = "granatier-15.11.90.tar.xz"; }; }; gwenview = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/gwenview-15.11.80.tar.xz"; - sha256 = "1w67bgbsfykg0lsh7vapimgp3wmlygdq9pcwdrbdscymwhhpirj3"; - name = "gwenview-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/gwenview-15.11.90.tar.xz"; + sha256 = "0n29iz2pdi848fwsz0xllylwh7mcdjrq8xwn51ysjrwf7vxc004y"; + name = "gwenview-15.11.90.tar.xz"; }; }; jovie = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/jovie-15.11.80.tar.xz"; - sha256 = "1mlwm31dbph2dzsjg64rbjq7nr3i6fnh5h45xlmbq6fi1906h9kw"; - name = "jovie-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/jovie-15.11.90.tar.xz"; + sha256 = "1zvx54vch6xdsig9s2nkdxs129fvcv2lbbvy18l68q1i9wn4ksnq"; + name = "jovie-15.11.90.tar.xz"; }; }; juk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/juk-15.11.80.tar.xz"; - sha256 = "0lc0x5pscqnzi5mhwsdd0qrqi8b8nwsqbqplfrbk4zlg5dvql7nl"; - name = "juk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/juk-15.11.90.tar.xz"; + sha256 = "1q9pzj9j5qhi70vbkcqylfpqxiclx3j0x71axn1v5svc8wrr1hv1"; + name = "juk-15.11.90.tar.xz"; }; }; kaccessible = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kaccessible-15.11.80.tar.xz"; - sha256 = "0vg684xnr46iipil058vwwa75rigq3hdq2isfzhi5qxxm9n1n6ri"; - name = "kaccessible-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kaccessible-15.11.90.tar.xz"; + sha256 = "03mpqp83m8m3f4kyr55v26k64sfx8nfsn4l0wcmmi166m8kdl4c2"; + name = "kaccessible-15.11.90.tar.xz"; }; }; kaccounts-integration = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kaccounts-integration-15.11.80.tar.xz"; - sha256 = "0sbihlzd837q1p52vjc5ym7c5vsms00rl7l5wa72pd8q9haqabz8"; - name = "kaccounts-integration-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kaccounts-integration-15.11.90.tar.xz"; + sha256 = "192ic4f9cm3w658cbmw967jx0d0w9x8jh3j1gg18lg7yfla3hmfm"; + name = "kaccounts-integration-15.11.90.tar.xz"; }; }; kaccounts-providers = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kaccounts-providers-15.11.80.tar.xz"; - sha256 = "12127sk2ki8hxrwap7mazz6ksqn5wf6wh6h3qb5sw1k8ngmqaxqd"; - name = "kaccounts-providers-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kaccounts-providers-15.11.90.tar.xz"; + sha256 = "1sc2krffspxn3lvx7jjwdqc46j628nk5x47sjwp8wpkwmawjnpy9"; + name = "kaccounts-providers-15.11.90.tar.xz"; }; }; kajongg = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kajongg-15.11.80.tar.xz"; - sha256 = "017x84r78kf25hv9xl7ac9hsrkzxdxdzgdxhq74mgw3lsnp9vrvp"; - name = "kajongg-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kajongg-15.11.90.tar.xz"; + sha256 = "1xyy3jfixbmbkzhb5lqhjd8yk4wlcc601ay5v6j24rngr3hnjmv9"; + name = "kajongg-15.11.90.tar.xz"; }; }; kalarmcal = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kalarmcal-15.11.80.tar.xz"; - sha256 = "1h11r2j2iw2cpd2javzpsnspjzy6h5bypj29j426m77b00d8jyaw"; - name = "kalarmcal-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kalarmcal-15.11.90.tar.xz"; + sha256 = "0dssjcdgrzxpadl5nh1v2fz4ncjf73yngjz92w4j1i6cpfkw5lrj"; + name = "kalarmcal-15.11.90.tar.xz"; }; }; kalgebra = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kalgebra-15.11.80.tar.xz"; - sha256 = "160m1jvfx03dafvzz37jap023p9ap0b2f59r9ayaf1y7ldagdip5"; - name = "kalgebra-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kalgebra-15.11.90.tar.xz"; + sha256 = "1lpi4kj6vdvlh2lkxsckfz6qx868v4li8zhvqs060qxmy2w0zw58"; + name = "kalgebra-15.11.90.tar.xz"; }; }; kalzium = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kalzium-15.11.80.tar.xz"; - sha256 = "0hw9a18h3ldvilz6aawnph62mc6v9yggapkyf478d9m7faqdpmll"; - name = "kalzium-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kalzium-15.11.90.tar.xz"; + sha256 = "13grbk9y1nqh4ir9764fac3hx8gxn9bya2nxqn296x7z1wibgr4m"; + name = "kalzium-15.11.90.tar.xz"; }; }; kamera = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kamera-15.11.80.tar.xz"; - sha256 = "0zhi6aimih3szdph4vn0s7a48bn97glp0kxdy6mfkcmx4hgv59v8"; - name = "kamera-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kamera-15.11.90.tar.xz"; + sha256 = "1nmsqrglaxgp7bg21x45lyplpz5bc7pqh3afkqd3p5mnmzpa38qi"; + name = "kamera-15.11.90.tar.xz"; }; }; kanagram = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kanagram-15.11.80.tar.xz"; - sha256 = "1hhpzk4yf9pxmdkydwazdvzm3iayh07wwp1p06nhd91zxgjh696y"; - name = "kanagram-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kanagram-15.11.90.tar.xz"; + sha256 = "0lyr873l68jajqhd2bairrv6f2pgfnjsx5j0hgssgl6v32c37727"; + name = "kanagram-15.11.90.tar.xz"; }; }; kapman = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kapman-15.11.80.tar.xz"; - sha256 = "1kdjdngsdm95w8skr21722nmv4h860gaa2zifbzkn387k348n23s"; - name = "kapman-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kapman-15.11.90.tar.xz"; + sha256 = "1hrpsn4f9k8jk1lp2cs8ykbnp3il9d495lsncrwmxycn2grd22dx"; + name = "kapman-15.11.90.tar.xz"; }; }; kapptemplate = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kapptemplate-15.11.80.tar.xz"; - sha256 = "0xs5x6hlsm41axavdr3dbaqhcr5ncjigwxzcvr0d3v58k4w55va5"; - name = "kapptemplate-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kapptemplate-15.11.90.tar.xz"; + sha256 = "1hiz1vas8ja0n4m0jwpbhnn6fxga4shvjrls9nhga359y2adsxid"; + name = "kapptemplate-15.11.90.tar.xz"; }; }; kate = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kate-15.11.80.tar.xz"; - sha256 = "0503hzhys5004d8f72j8q5vifi39shfkdvj3kvs1wy4naipg6906"; - name = "kate-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kate-15.11.90.tar.xz"; + sha256 = "153pl21nin1v2419kj1iwgasgn7abxbi8shmg1dvd7s8p7rh4z77"; + name = "kate-15.11.90.tar.xz"; }; }; katomic = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/katomic-15.11.80.tar.xz"; - sha256 = "0brp5zxaaw9ymyvdbw47c72s9ms6q0prgn327qmnzjpcvi1nagiv"; - name = "katomic-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/katomic-15.11.90.tar.xz"; + sha256 = "0aam62g97aab9prfp64r6wcw41lc4qdsr7wp4ip4z3n4pplwsg4q"; + name = "katomic-15.11.90.tar.xz"; }; }; kblackbox = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kblackbox-15.11.80.tar.xz"; - sha256 = "06qpbivv7jmj900pizs35kivsyz34z6smw3vjmczh5cg6wccjwwc"; - name = "kblackbox-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kblackbox-15.11.90.tar.xz"; + sha256 = "0kjfjv6955w1k8nbldaplwfjdn7nvyz6s4l1xlx1zjp8vin1gvcv"; + name = "kblackbox-15.11.90.tar.xz"; }; }; kblocks = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kblocks-15.11.80.tar.xz"; - sha256 = "0rf60pa73kj5zcyvswpx0pwwrkxif2z8gj75cj1qg20nl15xzcv9"; - name = "kblocks-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kblocks-15.11.90.tar.xz"; + sha256 = "0z7z575z5npihq7rsigrk2043n5r857x9wcj47f86r1vf4nli0vf"; + name = "kblocks-15.11.90.tar.xz"; }; }; kblog = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kblog-15.11.80.tar.xz"; - sha256 = "09ywpx0pkl518hshlcbqx5g7kfrivz0j440xkp7slzaw5ydslh9w"; - name = "kblog-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kblog-15.11.90.tar.xz"; + sha256 = "1lk27i7a18k30ayc4xbbzqs2sacib5zx0dq3fi0hm2axn9zi618w"; + name = "kblog-15.11.90.tar.xz"; }; }; kbounce = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kbounce-15.11.80.tar.xz"; - sha256 = "1brgv8zc9zw6hkg2315dhnqpk4s2wdv223pxxp7dqcjg28zmr8fs"; - name = "kbounce-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kbounce-15.11.90.tar.xz"; + sha256 = "0nqxwiiym4bq1wgcmnvik0jwxy9866gy3slygxn3bi9mzmplnw15"; + name = "kbounce-15.11.90.tar.xz"; }; }; kbreakout = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kbreakout-15.11.80.tar.xz"; - sha256 = "1rr606dgsj75cy665q94cdqz68glc0n8r59ihmwgjkz2xg06cpnc"; - name = "kbreakout-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kbreakout-15.11.90.tar.xz"; + sha256 = "1lfbf65ybah5mqq0lsh2jq8wxnrr011b5pfjd8ph2cfi2140iyjp"; + name = "kbreakout-15.11.90.tar.xz"; }; }; kbruch = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kbruch-15.11.80.tar.xz"; - sha256 = "1hqnxj4f005jbhhbhjac5lzpmhbfgmsw4mhqavw79v42nldmaygj"; - name = "kbruch-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kbruch-15.11.90.tar.xz"; + sha256 = "10p6a8hs3p9bk209w3x47bivipmsgzklb5zsw37xwrc9icvfqysf"; + name = "kbruch-15.11.90.tar.xz"; }; }; kcachegrind = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcachegrind-15.11.80.tar.xz"; - sha256 = "0rc308n9yrjfmdg8v0fz4qmm9p8vvvihw9mvc7n31kpfwwlymx3n"; - name = "kcachegrind-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcachegrind-15.11.90.tar.xz"; + sha256 = "1mc8vq3xkswfrdxbihv2ai473zjc1zbqzz74agx9i0iz488x1fy8"; + name = "kcachegrind-15.11.90.tar.xz"; }; }; kcalc = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcalc-15.11.80.tar.xz"; - sha256 = "1dvnj2fnl6rjcfw373xplchzkkl63lr0h1b1d0h2l36i7j37g0ih"; - name = "kcalc-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcalc-15.11.90.tar.xz"; + sha256 = "1cggmkydxpzija2llp4cml971z824ick3nfl03r8ap5ya65vk90i"; + name = "kcalc-15.11.90.tar.xz"; }; }; kcalcore = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcalcore-15.11.80.tar.xz"; - sha256 = "1kxw4cvz72flb3587wzx1p8vykwhwjbsw2xq10z6zvk55s8y9g8h"; - name = "kcalcore-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcalcore-15.11.90.tar.xz"; + sha256 = "1sw776d8pvp33qnm9dccmc8ggxmc66qq7lsvxndkvz7hmwq5pjs8"; + name = "kcalcore-15.11.90.tar.xz"; }; }; kcalutils = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcalutils-15.11.80.tar.xz"; - sha256 = "0gnw0j92nk9gf40gn0ikbmij8qd3p8zsqwwcq8rbmrlh6g31cb94"; - name = "kcalutils-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcalutils-15.11.90.tar.xz"; + sha256 = "1fy52kba0qfwdjkl2p61m31igs8g2hi11g48z6hblalx7y7g7qyf"; + name = "kcalutils-15.11.90.tar.xz"; }; }; kcharselect = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcharselect-15.11.80.tar.xz"; - sha256 = "0sdq3vwkcjm59gbyq7hz3lhpkwrhb6xv4rrdpw9wfhh50gy1ckif"; - name = "kcharselect-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcharselect-15.11.90.tar.xz"; + sha256 = "09vwsqhh8shnylcbpm91rvsk6ijf6xnbnrb6zsbf0ymp46h43jaz"; + name = "kcharselect-15.11.90.tar.xz"; }; }; kcolorchooser = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcolorchooser-15.11.80.tar.xz"; - sha256 = "1i2s7ay2r0ymfrhcnmvza627ni2m955c9m7c085h5qchgmljp994"; - name = "kcolorchooser-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcolorchooser-15.11.90.tar.xz"; + sha256 = "0vnf3fkad37s5irkg864r0cmdr9kwhsalydcji3zsxjcki0hfgdi"; + name = "kcolorchooser-15.11.90.tar.xz"; }; }; kcontacts = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcontacts-15.11.80.tar.xz"; - sha256 = "1wa45vyd7j3zbi1wsz4z0mkhf2ii4qnb7pd8rshvh4z929f1kqg8"; - name = "kcontacts-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcontacts-15.11.90.tar.xz"; + sha256 = "16x0334hgb363266k4rf7xw8dq88pi5jcds93g8q1dyyk1qgh1bx"; + name = "kcontacts-15.11.90.tar.xz"; }; }; kcron = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kcron-15.11.80.tar.xz"; - sha256 = "10dndgavnmwagkfylbji23kvyblnj5p7drygds6md0dqmcdnlvg6"; - name = "kcron-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kcron-15.11.90.tar.xz"; + sha256 = "0y0sv96z9y3wa151rid6r5nssbznvpv26pzcf0i2axnj8pq5z8sp"; + name = "kcron-15.11.90.tar.xz"; }; }; kde-baseapps = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-baseapps-15.11.80.tar.xz"; - sha256 = "14d5rx0rl6673h949b0c51pxx0a604wsv1sdwyd44ym6z7p5nvab"; - name = "kde-baseapps-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-baseapps-15.11.90.tar.xz"; + sha256 = "1zc2rh8ni8anjvirbmy1qypvcryfbxxjmlsmxr9zvkk4yjnffy8n"; + name = "kde-baseapps-15.11.90.tar.xz"; }; }; kdebugsettings = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdebugsettings-15.11.80.tar.xz"; - sha256 = "1z0h2ng4v287bb1pjwfdq2slhy6ph516k458jyjsv2mgkjfi5fhi"; - name = "kdebugsettings-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdebugsettings-15.11.90.tar.xz"; + sha256 = "1qhavzgcd4i0dydajhi8qf129kdwwbd235nawy038n4lz13daj1z"; + name = "kdebugsettings-15.11.90.tar.xz"; }; }; kde-dev-scripts = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-dev-scripts-15.11.80.tar.xz"; - sha256 = "001396pg0jgy3rdk44fi3c2bavqzbfryi75d0ldn33jzhpa2l7sl"; - name = "kde-dev-scripts-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-dev-scripts-15.11.90.tar.xz"; + sha256 = "0h5mwc6aclb2md0hifdrjqqk1h39lw2l414z0x901b49gjv9ajly"; + name = "kde-dev-scripts-15.11.90.tar.xz"; }; }; kde-dev-utils = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-dev-utils-15.11.80.tar.xz"; - sha256 = "0jkmgdap3win3znz089nc8znpa001scs0la7rni1a3fh7fm6x1pc"; - name = "kde-dev-utils-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-dev-utils-15.11.90.tar.xz"; + sha256 = "0kn1s2djs0zz530a83hq23g54xjdk3jksq9a45vgg2l2383f48m0"; + name = "kde-dev-utils-15.11.90.tar.xz"; }; }; kdeedu-data = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdeedu-data-15.11.80.tar.xz"; - sha256 = "17mfb3xp5xpbx6wfs88frdqh9732jfliv4kq5nba8mh3h8vrnrrb"; - name = "kdeedu-data-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdeedu-data-15.11.90.tar.xz"; + sha256 = "0fnrc0dbjxiwhbi9zknqh4n5805ydd4a7vxpnyzaqdc0gvbzvq0a"; + name = "kdeedu-data-15.11.90.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdegraphics-mobipocket-15.11.80.tar.xz"; - sha256 = "1yydb4g0dd9pfq8lypp245y42zk18f63khp7na61c04k04d6vfwl"; - name = "kdegraphics-mobipocket-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-mobipocket-15.11.90.tar.xz"; + sha256 = "04nwsgbsysgqnjr85v4dq5rjaqys4f87vcn64rgfa6j9m6pkcx5w"; + name = "kdegraphics-mobipocket-15.11.90.tar.xz"; }; }; kdegraphics-strigi-analyzer = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdegraphics-strigi-analyzer-15.11.80.tar.xz"; - sha256 = "0z0gx48rjxad45ar4spppxndpr13zx4lvb8zx2whpdbhf43a8xng"; - name = "kdegraphics-strigi-analyzer-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-strigi-analyzer-15.11.90.tar.xz"; + sha256 = "0d8c5kf0xd804irhdisdkhaxkh5qpjf37gnkklxm77i66k5x63p9"; + name = "kdegraphics-strigi-analyzer-15.11.90.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdegraphics-thumbnailers-15.11.80.tar.xz"; - sha256 = "0gpwv1d8v2x631p2zdpq5b6wbr5zjvawh04pfajkbi45iby9z156"; - name = "kdegraphics-thumbnailers-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-thumbnailers-15.11.90.tar.xz"; + sha256 = "1l7n3j8qf633limppvx4gy783fyrkwq129dj46bm48j8igrpkjcl"; + name = "kdegraphics-thumbnailers-15.11.90.tar.xz"; }; }; kde-l10n-ar = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ar-15.11.80.tar.xz"; - sha256 = "07hdcqm0f5i47g7vzgdc7mhn03hv0nbrww24xqx7kmzxmq8ficik"; - name = "kde-l10n-ar-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ar-15.11.90.tar.xz"; + sha256 = "01qkrgzvrll84mfq10ahrr9c55yd63avns5fl1yn83hg047qrxj1"; + name = "kde-l10n-ar-15.11.90.tar.xz"; }; }; kde-l10n-bg = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-bg-15.11.80.tar.xz"; - sha256 = "1cx7vax6n27ai54zpxibi9q2v1ilkzw5vs4zk7y7fr3r8llsn3ci"; - name = "kde-l10n-bg-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-bg-15.11.90.tar.xz"; + sha256 = "1cs0c4wsb247s8df5a7rsdjiky010i6b2m6m57jj593j8lmjgj95"; + name = "kde-l10n-bg-15.11.90.tar.xz"; }; }; kde-l10n-bs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-bs-15.11.80.tar.xz"; - sha256 = "1nw5h67j7qis4h127f101c5b5zc82r2pwfb7rhc0jg8fyxrkb0l9"; - name = "kde-l10n-bs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-bs-15.11.90.tar.xz"; + sha256 = "12hcr2yzd86n4kyxdbdnzxxjg637xmn1n72s0i9wdybgp385544k"; + name = "kde-l10n-bs-15.11.90.tar.xz"; }; }; kde-l10n-ca = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ca-15.11.80.tar.xz"; - sha256 = "1x6p2bklh2qf047ws9jincbgk33c9xsg20xsyfazp7x4iyrsw3lv"; - name = "kde-l10n-ca-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ca-15.11.90.tar.xz"; + sha256 = "0xxx3hic96743z38n866w6d75w66hwkc5467l7y5dxba25z1m78m"; + name = "kde-l10n-ca-15.11.90.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-15.11.80"; + version = "ca_valencia-15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ca@valencia-15.11.80.tar.xz"; - sha256 = "1n58flzasr0r64pqhh8j7rizz0w3h9xdjhlj8c18mm50xyp011bq"; - name = "kde-l10n-ca_valencia-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ca@valencia-15.11.90.tar.xz"; + sha256 = "05fw6vks4dm2rpa47jpds9ss57178k9vz0rgg8jfc4jdvsgs1cj6"; + name = "kde-l10n-ca_valencia-15.11.90.tar.xz"; }; }; kde-l10n-cs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-cs-15.11.80.tar.xz"; - sha256 = "0mnwbb9s2x2pl168awxygrah8a8yzn2zlsrh7fp9kbhiypwr8gvl"; - name = "kde-l10n-cs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-cs-15.11.90.tar.xz"; + sha256 = "1vr2c9wkvpziklbynzbam8y97c047ja7gmqkpjj1mhwd9iy1rs8p"; + name = "kde-l10n-cs-15.11.90.tar.xz"; }; }; kde-l10n-da = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-da-15.11.80.tar.xz"; - sha256 = "0igc9dzj7l7n4kznlij0myvqsdcm2a2hf80j23wh810d1fkgg16a"; - name = "kde-l10n-da-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-da-15.11.90.tar.xz"; + sha256 = "1ihxgqlrm8z1srkkz44r43zqa38rb36d6z5c18ipp7186aiwzhcs"; + name = "kde-l10n-da-15.11.90.tar.xz"; }; }; kde-l10n-de = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-de-15.11.80.tar.xz"; - sha256 = "1mwaiapzailc644j5qcmac3m3h5jg7swia21gshdpywcjisrrka7"; - name = "kde-l10n-de-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-de-15.11.90.tar.xz"; + sha256 = "0wzzg9ym17q88pb4dzg6jllmpsj49wb04sskinszvpngxxf1pl2d"; + name = "kde-l10n-de-15.11.90.tar.xz"; }; }; kde-l10n-el = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-el-15.11.80.tar.xz"; - sha256 = "1f0nj7lh2hgs6yxwxcgmc9ydiy294d2pfxffqg3nvk6r7qxxr62i"; - name = "kde-l10n-el-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-el-15.11.90.tar.xz"; + sha256 = "0sn03wvrlsci2whhwza6vq5r5mr8x66xag0kkd9jmzx76xjxrdlg"; + name = "kde-l10n-el-15.11.90.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-15.11.80"; + version = "en_GB-15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-en_GB-15.11.80.tar.xz"; - sha256 = "05kxsfmj6p3w10ily3yn3l53zgjib0v10whq8ls5l99aygws90y3"; - name = "kde-l10n-en_GB-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-en_GB-15.11.90.tar.xz"; + sha256 = "04cv9aj7my5ffqq1lnraa628c6nkc3110zmzvchhagqnb0nhi20s"; + name = "kde-l10n-en_GB-15.11.90.tar.xz"; }; }; kde-l10n-eo = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-eo-15.11.80.tar.xz"; - sha256 = "1wial0ky930cg66a5f0a7j7f57m7c8nyj62v6c66irdskfm5gh9d"; - name = "kde-l10n-eo-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-eo-15.11.90.tar.xz"; + sha256 = "027x3hxzwa1g40zp5vwza138yyvi99a64gm568xdzvxf0h5d4dcs"; + name = "kde-l10n-eo-15.11.90.tar.xz"; }; }; kde-l10n-es = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-es-15.11.80.tar.xz"; - sha256 = "02jz8lm6rz14vp0abycnyghwz87vc6qca2371p8bnsz4sggqbarj"; - name = "kde-l10n-es-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-es-15.11.90.tar.xz"; + sha256 = "04vwp1wrxlgzc716kfhbfng4mvcw47zwz54p2d8gjhviskh64k5i"; + name = "kde-l10n-es-15.11.90.tar.xz"; }; }; kde-l10n-et = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-et-15.11.80.tar.xz"; - sha256 = "1da4jz8a8ixkalwvf27mknchrr761a0rifjghjl2wlr463ivba4q"; - name = "kde-l10n-et-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-et-15.11.90.tar.xz"; + sha256 = "0fg6nscjhymz7dx9szcfhlx4mkx5rbqfrk4yikm849flr86i7njr"; + name = "kde-l10n-et-15.11.90.tar.xz"; }; }; kde-l10n-eu = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-eu-15.11.80.tar.xz"; - sha256 = "1l0clwn2h6ph6jgnv3vrfx2ww04rm55byrndivm78x1i8vci8jx0"; - name = "kde-l10n-eu-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-eu-15.11.90.tar.xz"; + sha256 = "0czfx3xi32ldsa57hd5ab43lgw9p1nrz9q82vd0kz35yfgspvp0y"; + name = "kde-l10n-eu-15.11.90.tar.xz"; }; }; kde-l10n-fa = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-fa-15.11.80.tar.xz"; - sha256 = "0v2vcpyvih2xmx69yg1d9wyh988f3439g66vk01wqp2gsa505r1p"; - name = "kde-l10n-fa-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fa-15.11.90.tar.xz"; + sha256 = "1ci4mni45imwdaf4jbisb1c1yx9kj2j3dr7267n1fvmbpxfx55bf"; + name = "kde-l10n-fa-15.11.90.tar.xz"; }; }; kde-l10n-fi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-fi-15.11.80.tar.xz"; - sha256 = "0shxcr6xndxz2136nx1qhm4kbfcgxw3j8fnby1jgjqz8shfjz318"; - name = "kde-l10n-fi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fi-15.11.90.tar.xz"; + sha256 = "1nwd32h0il6bd9lxlkvxk2caf7d51w2ng6nwh8j95p4h95b8pb4j"; + name = "kde-l10n-fi-15.11.90.tar.xz"; }; }; kde-l10n-fr = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-fr-15.11.80.tar.xz"; - sha256 = "1b1cs3fwzknhm3rd2ipbgx63wkn7idck825wvpjbgipg65q6a788"; - name = "kde-l10n-fr-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fr-15.11.90.tar.xz"; + sha256 = "0airxvji5z0g2ydgj0npn906z6r2wp3hjlmf1frjl29nwbj46wxw"; + name = "kde-l10n-fr-15.11.90.tar.xz"; }; }; kde-l10n-ga = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ga-15.11.80.tar.xz"; - sha256 = "05z536w3djr5p89vbyc1rj8d9z4cwgym74fv08jaz816iq1cz8ww"; - name = "kde-l10n-ga-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ga-15.11.90.tar.xz"; + sha256 = "184i1mskqr0f59xr8g72ph1472z66y6pq4phs31s7wxqjx90icb7"; + name = "kde-l10n-ga-15.11.90.tar.xz"; }; }; kde-l10n-gl = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-gl-15.11.80.tar.xz"; - sha256 = "0jrv68qjcrikgpnqsgdgxj6nl0m2prbgj418fjns1c4c4lna43qk"; - name = "kde-l10n-gl-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-gl-15.11.90.tar.xz"; + sha256 = "0lllkr65dd7s388d5khj1p6q6iymdrs3m1jmj0v0npycf613pcvf"; + name = "kde-l10n-gl-15.11.90.tar.xz"; }; }; kde-l10n-he = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-he-15.11.80.tar.xz"; - sha256 = "0h71g3rqsvfwkvj2rwf6c0mma6qmp2h0nrbc3biqijgjxl8vyd5s"; - name = "kde-l10n-he-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-he-15.11.90.tar.xz"; + sha256 = "0zdmpgxmzigwpliysjcjr80fdrywvk8as6s8ym1z5aliiqb8b78q"; + name = "kde-l10n-he-15.11.90.tar.xz"; }; }; kde-l10n-hi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-hi-15.11.80.tar.xz"; - sha256 = "1blwzqk0v9455c1lsvb9q5qf0x2lj0zj5av8vxbicfd35hr6hc6y"; - name = "kde-l10n-hi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hi-15.11.90.tar.xz"; + sha256 = "0qkfhdypj41ympfqk9m6nsg868wfjf1hcc785r0fh4a32mbc6h98"; + name = "kde-l10n-hi-15.11.90.tar.xz"; }; }; kde-l10n-hr = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-hr-15.11.80.tar.xz"; - sha256 = "11zz6zjk13hqd9i409786d6xinkpyaynlza2dkql104kzymbyknf"; - name = "kde-l10n-hr-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hr-15.11.90.tar.xz"; + sha256 = "0aq8lnibjvjc0vchy1jfadidfl31xwwrxdmd3b3c6cd2v6fyhp5k"; + name = "kde-l10n-hr-15.11.90.tar.xz"; }; }; kde-l10n-hu = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-hu-15.11.80.tar.xz"; - sha256 = "18hzyyv5ijl29b27q9jfm9sq0w82638yb4gjabq7rkngy0h2v02x"; - name = "kde-l10n-hu-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hu-15.11.90.tar.xz"; + sha256 = "0y1awp3rfmxw5h595v5cv8fqswyyjg3x69b6dhmqnrsv9jh6ww3q"; + name = "kde-l10n-hu-15.11.90.tar.xz"; }; }; kde-l10n-ia = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ia-15.11.80.tar.xz"; - sha256 = "013acls9vqfhpr6yzfpg6c3yn87myrznq2qxm2n4lgmksibw8l38"; - name = "kde-l10n-ia-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ia-15.11.90.tar.xz"; + sha256 = "1c7sfm5nh6fbc7h0hia1w9wsszggdii6ssrly9pxxghnifx1ry8x"; + name = "kde-l10n-ia-15.11.90.tar.xz"; }; }; kde-l10n-id = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-id-15.11.80.tar.xz"; - sha256 = "0l1vsa5s6zdiymw67iy28fsarh2lgi4wpcma7nnbj90jf4l7zj0g"; - name = "kde-l10n-id-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-id-15.11.90.tar.xz"; + sha256 = "1k5ixg654v9pfzc0z5cf76kzfc4432shyw6hiq2h861zy96vlvz7"; + name = "kde-l10n-id-15.11.90.tar.xz"; }; }; kde-l10n-is = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-is-15.11.80.tar.xz"; - sha256 = "07rs26zl15qar6pn6mg3ihfx78zakqn5mbvqv7f0zjsfd6fmmkxx"; - name = "kde-l10n-is-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-is-15.11.90.tar.xz"; + sha256 = "1gsvgydqki3h1hqmmazcj66w4f5q1w539yjksw7izw64wd94sn18"; + name = "kde-l10n-is-15.11.90.tar.xz"; }; }; kde-l10n-it = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-it-15.11.80.tar.xz"; - sha256 = "0x7qi9rgma6l7i80r5i37jh35zfi4j6axk6ha1h9dbmyfw9p1fkr"; - name = "kde-l10n-it-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-it-15.11.90.tar.xz"; + sha256 = "11wdxb18wjzvv72ljzwqpbybimqg7aj3qdr1d6r2h2bmv19q5zy4"; + name = "kde-l10n-it-15.11.90.tar.xz"; }; }; kde-l10n-ja = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ja-15.11.80.tar.xz"; - sha256 = "0dh8k8gyimzdhmycz8711l2hn0rddprywqz1brs7m43shx8cqxk7"; - name = "kde-l10n-ja-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ja-15.11.90.tar.xz"; + sha256 = "12mpnbrq7knkjmi3fp22qq18r0fzvii6hrgn45kyqf80s5m9cslm"; + name = "kde-l10n-ja-15.11.90.tar.xz"; }; }; kde-l10n-kk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-kk-15.11.80.tar.xz"; - sha256 = "1r9w4yw3fc4v0pgy130phvapy69p1b7j1gzayg60lakckr3wbpd8"; - name = "kde-l10n-kk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-kk-15.11.90.tar.xz"; + sha256 = "0qhf5a8xwyb7nxgndainzycy4r8v1xk2qqbj3hcyhy9kz7g9cb66"; + name = "kde-l10n-kk-15.11.90.tar.xz"; }; }; kde-l10n-km = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-km-15.11.80.tar.xz"; - sha256 = "10swsr4zvrv42d2i2w45kqmaqkba7an7w6f519qqsnmp4ykcl0dk"; - name = "kde-l10n-km-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-km-15.11.90.tar.xz"; + sha256 = "1i67pmc9q4dh96zdinhby2ffgwv3q0yzl1r83n3gk70vigbqdm4x"; + name = "kde-l10n-km-15.11.90.tar.xz"; }; }; kde-l10n-ko = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ko-15.11.80.tar.xz"; - sha256 = "07ly80fbz0kqiam3ykfilv6q4y0pa6nzi9chxas830xzzkygri9k"; - name = "kde-l10n-ko-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ko-15.11.90.tar.xz"; + sha256 = "1l453c5na6n1pmls5w702zcv0vxcf3v6a6xvkjawwr58i6dzcwkx"; + name = "kde-l10n-ko-15.11.90.tar.xz"; }; }; kde-l10n-lt = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-lt-15.11.80.tar.xz"; - sha256 = "11xq8wv3rcg8yz76mnb0052xd6h8l5wis5c9k6lrpqik57kg06ic"; - name = "kde-l10n-lt-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-lt-15.11.90.tar.xz"; + sha256 = "0kwv9hgk9v17wg1hnx5rrlxdzjjdhj4hsgvl4jps11vaxw6z5l3y"; + name = "kde-l10n-lt-15.11.90.tar.xz"; }; }; kde-l10n-lv = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-lv-15.11.80.tar.xz"; - sha256 = "0wxd9cbzgw404zvi94zs71sx65cai8xhks8jb6j5g0086iscar5a"; - name = "kde-l10n-lv-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-lv-15.11.90.tar.xz"; + sha256 = "0w5cq3jrjvwyzsnwj57f2n342si9xy2bggf0904yzi2kg9fy503m"; + name = "kde-l10n-lv-15.11.90.tar.xz"; }; }; kde-l10n-mr = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-mr-15.11.80.tar.xz"; - sha256 = "116pk7fzba0k32pl8mdgaq54xxhqg43y7vv1ra0dgilf0znpibyv"; - name = "kde-l10n-mr-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-mr-15.11.90.tar.xz"; + sha256 = "1wkxz8v8y1fkzbwdmiwphfmgdgar4cbs37d32cvlql94ivwg7bm8"; + name = "kde-l10n-mr-15.11.90.tar.xz"; }; }; kde-l10n-nb = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-nb-15.11.80.tar.xz"; - sha256 = "03y3qbf8nfbqh0c2saznv12igg82bj56i791ksxcphlm5065rlzq"; - name = "kde-l10n-nb-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nb-15.11.90.tar.xz"; + sha256 = "05xbfc1pv8m8qdyh9c9cxzq59xrgd1amkc00nwk2sxbnwr3nw8ks"; + name = "kde-l10n-nb-15.11.90.tar.xz"; }; }; kde-l10n-nds = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-nds-15.11.80.tar.xz"; - sha256 = "0wr842xfclxbx5w30f2aig2rdq5p2vrhd91kr5v9zcidgddms2fj"; - name = "kde-l10n-nds-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nds-15.11.90.tar.xz"; + sha256 = "00l83v501p73kbjwhhc22gxvyjd2fgyhdw41z89a1ghb0gg721pd"; + name = "kde-l10n-nds-15.11.90.tar.xz"; }; }; kde-l10n-nl = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-nl-15.11.80.tar.xz"; - sha256 = "110fwbf2b6ss21vrswj3d3d9zlr1n2p44vs3znwcrv9pjds2v8jg"; - name = "kde-l10n-nl-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nl-15.11.90.tar.xz"; + sha256 = "0wdfxl5a4n0iqw9sk45pbj78rp8gb1r4y1l2abkbwr8jfmfamjn1"; + name = "kde-l10n-nl-15.11.90.tar.xz"; }; }; kde-l10n-nn = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-nn-15.11.80.tar.xz"; - sha256 = "073zcpwx8acv1hdwkk8w7nzkrg6qfb4w4lvah8gkgjhl2r6h4lkr"; - name = "kde-l10n-nn-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nn-15.11.90.tar.xz"; + sha256 = "1wzmf0yrz5dn87xg6z8df8izvdv7fricazsy5wb81aksi24hk2n2"; + name = "kde-l10n-nn-15.11.90.tar.xz"; }; }; kde-l10n-pa = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-pa-15.11.80.tar.xz"; - sha256 = "1x99m4rj99wdlyiqmgl9vs125vdjl2g46nk1q0xb2xz7znn003na"; - name = "kde-l10n-pa-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pa-15.11.90.tar.xz"; + sha256 = "1gwphwmwg6dgmw9hak7ps1xhjkmq76cs2rbbfl5z31zjv0lhzrdm"; + name = "kde-l10n-pa-15.11.90.tar.xz"; }; }; kde-l10n-pl = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-pl-15.11.80.tar.xz"; - sha256 = "0hxsdbcclgnalkzpvrl948l4yb122lg8bhxg0mkcm23jmvi594cv"; - name = "kde-l10n-pl-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pl-15.11.90.tar.xz"; + sha256 = "1db898g2xn1i6w343axcv91aca32n0dhxh6cri6p6jq1a0rc9vbr"; + name = "kde-l10n-pl-15.11.90.tar.xz"; }; }; kde-l10n-pt = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-pt-15.11.80.tar.xz"; - sha256 = "1wijadwzv119dyx7wpddwiyc4jip1lqwkhb01dvyq1dzzkjf39f4"; - name = "kde-l10n-pt-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pt-15.11.90.tar.xz"; + sha256 = "00x2iwd6929ry5r4a3h00rsxn7ssnmq29zsra2axl796dyqdbzds"; + name = "kde-l10n-pt-15.11.90.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-15.11.80"; + version = "pt_BR-15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-pt_BR-15.11.80.tar.xz"; - sha256 = "19ki8sf4mj8fjrf2f7a43bj8bnqg9bc0m6982ba558nxdb3lr7fs"; - name = "kde-l10n-pt_BR-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pt_BR-15.11.90.tar.xz"; + sha256 = "06xnn7xdzl5lqasy2sh6a323j1ny8f8i8z8ggp4d8igwcni7rkvy"; + name = "kde-l10n-pt_BR-15.11.90.tar.xz"; }; }; kde-l10n-ro = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ro-15.11.80.tar.xz"; - sha256 = "1p79xvd49vs81gn18pzmpjz6qy974ryn3ywvqda920nb1wfaqh1k"; - name = "kde-l10n-ro-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ro-15.11.90.tar.xz"; + sha256 = "0mganx5zh51inlrz9iyk8cvp7w33qd3y1vyxw6v1aclcc91dl4ba"; + name = "kde-l10n-ro-15.11.90.tar.xz"; }; }; kde-l10n-ru = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ru-15.11.80.tar.xz"; - sha256 = "04x6ym1gs1n6krg9k876gfk7d4ljrxvwv5lmagmjadx7dhfvy4ym"; - name = "kde-l10n-ru-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ru-15.11.90.tar.xz"; + sha256 = "0d0lz1jzrkv9ymdwadlmbqns9n521nv1cc0243hv7piwg9v02v1k"; + name = "kde-l10n-ru-15.11.90.tar.xz"; }; }; kde-l10n-sk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-sk-15.11.80.tar.xz"; - sha256 = "0mdy9fhppnm5nkanb7q2myinngmnf6hq3iywvhg66iv6nsmbjdw9"; - name = "kde-l10n-sk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sk-15.11.90.tar.xz"; + sha256 = "18y301b845b3zf5grcf9h4x97qc05jg7mw23j54d590x5k8ihbp6"; + name = "kde-l10n-sk-15.11.90.tar.xz"; }; }; kde-l10n-sl = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-sl-15.11.80.tar.xz"; - sha256 = "06nd0wjni4sfmiza6wb8m3mdrbkkvk0k5ymvar396wh8037mjp64"; - name = "kde-l10n-sl-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sl-15.11.90.tar.xz"; + sha256 = "1mqqzhsr8m7y7pygzx9qyqq4hzpccrp20d42n2dgbqqwy4w10nyh"; + name = "kde-l10n-sl-15.11.90.tar.xz"; }; }; kde-l10n-sr = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-sr-15.11.80.tar.xz"; - sha256 = "1pj9k4j6c5hfzl1lz7vyakggl6p8drrfy5ln7m69s1qy4skraf8x"; - name = "kde-l10n-sr-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sr-15.11.90.tar.xz"; + sha256 = "1rb3ivad7gskdnc9i7n6vm6a8i2davrs6b7imd06lgrcxzq56yqf"; + name = "kde-l10n-sr-15.11.90.tar.xz"; }; }; kde-l10n-sv = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-sv-15.11.80.tar.xz"; - sha256 = "18p880a66iz258lbc8hn3h217qcigi3glzml5r9yq2d8kmr1gfwg"; - name = "kde-l10n-sv-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sv-15.11.90.tar.xz"; + sha256 = "1xs1jjjzbihxj3ix4dbmvs329b9qhb1di2933dr41qlqm4kdnczh"; + name = "kde-l10n-sv-15.11.90.tar.xz"; }; }; kde-l10n-tr = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-tr-15.11.80.tar.xz"; - sha256 = "0r3sb0i1c0zzywsvkxzmhr67592ss6xzdaqmams6qa37znpxwjw3"; - name = "kde-l10n-tr-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-tr-15.11.90.tar.xz"; + sha256 = "055crwxa0fim4mpb1ghpcdjrnysqbnymc3c1yz0m3gkzy1bjlf3j"; + name = "kde-l10n-tr-15.11.90.tar.xz"; }; }; kde-l10n-ug = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-ug-15.11.80.tar.xz"; - sha256 = "0daw8qi6bn26xhvxnz3rs7xxqi5azhmj57ay8p62p84d6wfbswsw"; - name = "kde-l10n-ug-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ug-15.11.90.tar.xz"; + sha256 = "038lgvz17rnm8lx22gvisxf3r3ix80fvdvq18n8bnin3lfjqdhm7"; + name = "kde-l10n-ug-15.11.90.tar.xz"; }; }; kde-l10n-uk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-uk-15.11.80.tar.xz"; - sha256 = "0sfgsj4n0v0c99lmzbicjsyysf1n49413509lh0ljgmsr7v4mskw"; - name = "kde-l10n-uk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-uk-15.11.90.tar.xz"; + sha256 = "0yf5nja326qrqqqn7ssli83n8llqiq244a9q5ri4khdvp0i9ni7r"; + name = "kde-l10n-uk-15.11.90.tar.xz"; }; }; kde-l10n-wa = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-wa-15.11.80.tar.xz"; - sha256 = "04v29qq4n48lkql4nyxx4v95jl9v4gh5wxjqrimycw3n2xmrlbnb"; - name = "kde-l10n-wa-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-wa-15.11.90.tar.xz"; + sha256 = "03wxmf88vjg4h9dmi7jhzzq4vzabc2pr3gvl53b78l533x0ajss4"; + name = "kde-l10n-wa-15.11.90.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-15.11.80"; + version = "zh_CN-15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-zh_CN-15.11.80.tar.xz"; - sha256 = "15aa0b3bry1x87v9vwsylp06wzirq98jii1qfbkvh4cf17l23yvb"; - name = "kde-l10n-zh_CN-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-zh_CN-15.11.90.tar.xz"; + sha256 = "04yzvrpykp07rnml1p9xdh32cnil9s2jrn2h7826gf29imwk4b79"; + name = "kde-l10n-zh_CN-15.11.90.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-15.11.80"; + version = "zh_TW-15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-l10n/kde-l10n-zh_TW-15.11.80.tar.xz"; - sha256 = "0llisjlc6w13gqya7qgq9cxrqh8aicpz2q4z4afn770dqm02jbvn"; - name = "kde-l10n-zh_TW-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-zh_TW-15.11.90.tar.xz"; + sha256 = "0rbin45cp4iwn3pcvgks154y6jcj4qp6ah1is7l83spn5wyjw6lj"; + name = "kde-l10n-zh_TW-15.11.90.tar.xz"; }; }; kdenetwork-filesharing = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdenetwork-filesharing-15.11.80.tar.xz"; - sha256 = "0rip7k13lfpblg2lbpj6y1dj6j0gmr6ydqdqkcnb37lgrjr1cmn0"; - name = "kdenetwork-filesharing-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdenetwork-filesharing-15.11.90.tar.xz"; + sha256 = "19rkvxgkqkqrnsj0f1lh6wjm6fwsvl0n4hvfmy4wq2w669v7b1wx"; + name = "kdenetwork-filesharing-15.11.90.tar.xz"; }; }; kdenetwork-strigi-analyzers = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdenetwork-strigi-analyzers-15.11.80.tar.xz"; - sha256 = "097m04s0vflpfpkbf55k4drbs9w8mp1a80chwyn623mmvg2bdr92"; - name = "kdenetwork-strigi-analyzers-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdenetwork-strigi-analyzers-15.11.90.tar.xz"; + sha256 = "11nhrfvjqfasy9xyh3phqkbi3519z3hcf4d797w9jgd6386vw32d"; + name = "kdenetwork-strigi-analyzers-15.11.90.tar.xz"; }; }; kdenlive = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdenlive-15.11.80.tar.xz"; - sha256 = "0ms8q5daq8kklv73yhyh8905766zy6v26gbjcrsj4pvql3r6rbs4"; - name = "kdenlive-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdenlive-15.11.90.tar.xz"; + sha256 = "0cfhcd2wvski14w5zzn2vyvya5gymigp57wl54whll5f3p67x4h4"; + name = "kdenlive-15.11.90.tar.xz"; }; }; kdepim = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdepim-15.11.80.tar.xz"; - sha256 = "0zjrjlsd49c3zk0l12b9ijl62y8jmgkmllgvxkpzrblpn1mqjjls"; - name = "kdepim-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdepim-15.11.90.tar.xz"; + sha256 = "0iwwqmw7m06wjmx6iw2kn9ldnfz2pkvac5jvq78pmnf493v7avva"; + name = "kdepim-15.11.90.tar.xz"; }; }; kdepimlibs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdepimlibs-15.11.80.tar.xz"; - sha256 = "06z926a68b8k02w89qqddlarcnrr8wrpgvgg021xqnykgar3dy7h"; - name = "kdepimlibs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdepimlibs-15.11.90.tar.xz"; + sha256 = "0x575rqkfxfckc4rsckxiqi85mlvshqxn7pxik84iz98nrz8p73q"; + name = "kdepimlibs-15.11.90.tar.xz"; }; }; kdepim-runtime = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdepim-runtime-15.11.80.tar.xz"; - sha256 = "07xirx1z54xa7r4gcqfp0sz3r0vgi5f75klcmwna21j53hzc387r"; - name = "kdepim-runtime-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdepim-runtime-15.11.90.tar.xz"; + sha256 = "16ms6j9qcsd4xpc96l6ck88x805dzafz16d7zm0whwkpkghb7jb3"; + name = "kdepim-runtime-15.11.90.tar.xz"; }; }; kde-runtime = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kde-runtime-15.11.80.tar.xz"; - sha256 = "1470pp11nc8z1x6wr5b8cpvx6fzflzx2ds06zl2yrq96acl5g8sp"; - name = "kde-runtime-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kde-runtime-15.11.90.tar.xz"; + sha256 = "020gb46g8wnqypx0kxifvyfvg9vabi6cyiq4m9qg5gqixwzbfhv7"; + name = "kde-runtime-15.11.90.tar.xz"; }; }; kdesdk-kioslaves = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdesdk-kioslaves-15.11.80.tar.xz"; - sha256 = "1gm8k4xnkija07kssakpli32isf5455hfvq5pnciqlzf7lllmib7"; - name = "kdesdk-kioslaves-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-kioslaves-15.11.90.tar.xz"; + sha256 = "03m5sxagca23vb1h9s3hakn0wyr5z3wchnzsl1pnk6llbrb4s0mz"; + name = "kdesdk-kioslaves-15.11.90.tar.xz"; }; }; kdesdk-strigi-analyzers = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdesdk-strigi-analyzers-15.11.80.tar.xz"; - sha256 = "0h6pnssm3nfnk3fqva3qwbkw82vxrzkg7incg2qzpvk0pwbxgyz9"; - name = "kdesdk-strigi-analyzers-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-strigi-analyzers-15.11.90.tar.xz"; + sha256 = "1ck0mcpqm0fjyc0q46y7mwcl7p23fqi5smnllvx5f2xwzkcpp9pr"; + name = "kdesdk-strigi-analyzers-15.11.90.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdesdk-thumbnailers-15.11.80.tar.xz"; - sha256 = "0wm4gy020lz7mlgn6naixy4fz72xscdlg1vmpw37p4dmxzphmdxy"; - name = "kdesdk-thumbnailers-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-thumbnailers-15.11.90.tar.xz"; + sha256 = "1l8gq4hm8r6g2nr81bb2d7vyx64b64jbcawqgsg9p90g83j5zybd"; + name = "kdesdk-thumbnailers-15.11.90.tar.xz"; }; }; kdewebdev = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdewebdev-15.11.80.tar.xz"; - sha256 = "00qmfas4d2r1gh8w421zmxyfra1xbc76zdisyv48phhw80rpqwyx"; - name = "kdewebdev-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdewebdev-15.11.90.tar.xz"; + sha256 = "0shwkqjc7r415m4zsz3cs6gks4zh9z4h83r0vjzlcmi8crnimwh7"; + name = "kdewebdev-15.11.90.tar.xz"; }; }; kdf = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdf-15.11.80.tar.xz"; - sha256 = "19gazwf02kzga0980y6ixj5l56hjmzfms51zh0n7wl1cr8dbgg5i"; - name = "kdf-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdf-15.11.90.tar.xz"; + sha256 = "14yn33svspsrh51dmnvm5q84hhxrmfasmxpy2gg4qshba85k60mf"; + name = "kdf-15.11.90.tar.xz"; }; }; kdiamond = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kdiamond-15.11.80.tar.xz"; - sha256 = "0pp01c8n9m208hknigwcq5nvw5anf4621kip232iibw7pkwk8x2i"; - name = "kdiamond-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kdiamond-15.11.90.tar.xz"; + sha256 = "0qfs6jcdvvmffdpzqkb3r8s2i6r26w3ywcd914fwww4s8qghvhvg"; + name = "kdiamond-15.11.90.tar.xz"; }; }; kfloppy = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kfloppy-15.11.80.tar.xz"; - sha256 = "1935k4gm32kspjvb05jr24q1b3r31f96vs9g2s6b9s5a63b89w5j"; - name = "kfloppy-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kfloppy-15.11.90.tar.xz"; + sha256 = "01qwkp7d117rbxfwm2w6h2rg547c9ih6bqwxc1i1j82cggmrb7sw"; + name = "kfloppy-15.11.90.tar.xz"; }; }; kfourinline = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kfourinline-15.11.80.tar.xz"; - sha256 = "0y5hv4gr0nyilizcd90xka34n6xgqzgh9gh8gy8mw76xklnd1mfd"; - name = "kfourinline-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kfourinline-15.11.90.tar.xz"; + sha256 = "01lav9pgzcb8z9ranqzzf12iq0z0d5jvrn04cr927m3qnx434hqn"; + name = "kfourinline-15.11.90.tar.xz"; }; }; kgeography = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kgeography-15.11.80.tar.xz"; - sha256 = "01jzl84dc6jf48dx4i6vdv9mgnjvv92ssnamqkgs4jw2iva22s6f"; - name = "kgeography-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kgeography-15.11.90.tar.xz"; + sha256 = "0x4acd9cbhabsrz88y7iya6gnpdxh19bgkxhqyd3xj70nh1n43jh"; + name = "kgeography-15.11.90.tar.xz"; }; }; kget = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kget-15.11.80.tar.xz"; - sha256 = "17q7vpnx89zrgqgybxc1vjc596vgh82fpanqfbym5n0bxcpap8q5"; - name = "kget-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kget-15.11.90.tar.xz"; + sha256 = "0gzx0bnnp885bcx2bc0b5wp97dcazm5wx6aw0rlkrvz7vljb2jmh"; + name = "kget-15.11.90.tar.xz"; }; }; kgoldrunner = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kgoldrunner-15.11.80.tar.xz"; - sha256 = "0k815mkmd82aa6djyblm71ddl94796b52c0gf6c5dsg42r29w10f"; - name = "kgoldrunner-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kgoldrunner-15.11.90.tar.xz"; + sha256 = "1aks2ipzmkkrmmjz7bic0ggvsdgn8zd8b1sk3f8rz6z3iin8s7sh"; + name = "kgoldrunner-15.11.90.tar.xz"; }; }; kgpg = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kgpg-15.11.80.tar.xz"; - sha256 = "0p088fb8mhfgvp0zihdda0554yw8k90f1xkd6hc4c9ngjc7d2pjf"; - name = "kgpg-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kgpg-15.11.90.tar.xz"; + sha256 = "0i0zkzm30gq84b1r3gpbbqksicv399al46rqqzahalcl3j5hq9kg"; + name = "kgpg-15.11.90.tar.xz"; }; }; khangman = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/khangman-15.11.80.tar.xz"; - sha256 = "1lz2qgqddq18dczs9cax0r5pay9yxqn63j7msch0y99x33hfyidn"; - name = "khangman-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/khangman-15.11.90.tar.xz"; + sha256 = "0xbybx7v8pm7ff30ckfiylb6lrf0acbnwd80wy5rabplnjq56k4z"; + name = "khangman-15.11.90.tar.xz"; }; }; kholidays = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kholidays-15.11.80.tar.xz"; - sha256 = "086d0vbzz2xcq6ibd7ia97lz89452gz3cxb879rvqxz3cyhhyfwr"; - name = "kholidays-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kholidays-15.11.90.tar.xz"; + sha256 = "0pyd98ir6cs4abflk9lzsp847vi4wib9j970xzdp9sbi2rwqjcjh"; + name = "kholidays-15.11.90.tar.xz"; }; }; kidentitymanagement = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kidentitymanagement-15.11.80.tar.xz"; - sha256 = "1j159alnxhvq4mpd2vr7jnj091x58gv47ms1rxk865xc66xv956s"; - name = "kidentitymanagement-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kidentitymanagement-15.11.90.tar.xz"; + sha256 = "19qx3g25nw81fr2izzs52mih352yrf47d7shdk51ivr31ch728cb"; + name = "kidentitymanagement-15.11.90.tar.xz"; }; }; kig = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kig-15.11.80.tar.xz"; - sha256 = "0w19w1bmj2grinq6s7biqqbdv9njdwqsynncb605ldwfvxnyyw7w"; - name = "kig-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kig-15.11.90.tar.xz"; + sha256 = "1j678j0csm1xjk1yx38ml9929q9mxq8rnwpdybxfh40ckqw62qk4"; + name = "kig-15.11.90.tar.xz"; }; }; kigo = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kigo-15.11.80.tar.xz"; - sha256 = "169cl12z1mjk4jn3c1ncq2q5adravsqraqxp7zq63yz819mv2mxj"; - name = "kigo-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kigo-15.11.90.tar.xz"; + sha256 = "14dh86wwmxk3xpcvar7msx7rd6czqmm54ddr464p0i2r1vr9r1xg"; + name = "kigo-15.11.90.tar.xz"; }; }; killbots = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/killbots-15.11.80.tar.xz"; - sha256 = "13l02ndf3nyqq2qisfb4ap87z5jf1iplcs7mdj2iswmr57vpc16g"; - name = "killbots-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/killbots-15.11.90.tar.xz"; + sha256 = "1rv0m7a4v8bypzwghfzir0gnh8q3l0ql5m88q3796dms3xdsksdf"; + name = "killbots-15.11.90.tar.xz"; }; }; kimap = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kimap-15.11.80.tar.xz"; - sha256 = "12wcgjgkg8fk91g7f9g7kw2sp1783kv478m521rhl1cy345250sw"; - name = "kimap-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kimap-15.11.90.tar.xz"; + sha256 = "1x26xxkiz6a60dh84r8fbpb99lacpwi9rvsv77wk54nm8anzwr4l"; + name = "kimap-15.11.90.tar.xz"; }; }; kio-extras = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kio-extras-15.11.80.tar.xz"; - sha256 = "19i8dgs5spayilhc7wyn2g5f30yy9dkzn7vzj2fxd3bwvl8agn2a"; - name = "kio-extras-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kio-extras-15.11.90.tar.xz"; + sha256 = "1pgvbxkx6asclbfv450x6ih9g84gwxd21gkp7s2xbya9c22445wf"; + name = "kio-extras-15.11.90.tar.xz"; }; }; kiriki = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kiriki-15.11.80.tar.xz"; - sha256 = "0zrpvz8av3xcnlmms7akis1897pyqc6j9ysmv36gg4bsjj2g7ng3"; - name = "kiriki-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kiriki-15.11.90.tar.xz"; + sha256 = "0v9d2gkgk3ad8p40k5qdczxypqziaghr7fxq54cs2cpf2mkir95b"; + name = "kiriki-15.11.90.tar.xz"; }; }; kiten = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kiten-15.11.80.tar.xz"; - sha256 = "0ci4wq5hp4dbmrb511m1pz6kyr2knl7aa82sd9pphndfg64l0mpi"; - name = "kiten-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kiten-15.11.90.tar.xz"; + sha256 = "0xmcga41bcg5map804jqaag4z7w4i1dffy7pn3hx7hyqyk0wdad7"; + name = "kiten-15.11.90.tar.xz"; }; }; kjumpingcube = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kjumpingcube-15.11.80.tar.xz"; - sha256 = "121dd6gly5dqr85rvwnqaf9ssbaqlmhlg0crcs3idj9dwag9abvi"; - name = "kjumpingcube-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kjumpingcube-15.11.90.tar.xz"; + sha256 = "052ig7xf5q3f0cwn9khh9pm51n527iv4659nphg81hl2cx7cxn21"; + name = "kjumpingcube-15.11.90.tar.xz"; }; }; kldap = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kldap-15.11.80.tar.xz"; - sha256 = "1y5g13amhl14wdbb4sxdndrhcixc9xq0glrz17wz42w2jvsf1nsb"; - name = "kldap-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kldap-15.11.90.tar.xz"; + sha256 = "1rqgypkk0l1f8wc3wkd5bwpifpgd9411lkqw9qv748jvnxwyz4hm"; + name = "kldap-15.11.90.tar.xz"; }; }; klettres = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/klettres-15.11.80.tar.xz"; - sha256 = "1yiaz0ac9s99blqkb70228k5c575z05flqwmn1g13gdh8cyp41pj"; - name = "klettres-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/klettres-15.11.90.tar.xz"; + sha256 = "01qkhnbjqlr8zvr4w835kvgxn5vnnrvb1g2c4cvbnj6093p583h7"; + name = "klettres-15.11.90.tar.xz"; }; }; klickety = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/klickety-15.11.80.tar.xz"; - sha256 = "09801vm45llrd8h1r9xb4ch1za98scihs655d0g8v938zqm0mzsz"; - name = "klickety-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/klickety-15.11.90.tar.xz"; + sha256 = "0apl56jcvjk67qy05nyn0mq9pakj6vqfw9k1sgzpcx1nppzn0whp"; + name = "klickety-15.11.90.tar.xz"; }; }; klines = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/klines-15.11.80.tar.xz"; - sha256 = "1ssg07a48ymh3kl7pgd9wvfqf1q4kysl3c2ygiassl2dzk8inn6c"; - name = "klines-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/klines-15.11.90.tar.xz"; + sha256 = "07dbf0dwabwd6hckbgdxj2a5wfv5ikc6slmf907ba7v82bhkhxas"; + name = "klines-15.11.90.tar.xz"; }; }; kmag = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmag-15.11.80.tar.xz"; - sha256 = "0pdm8jj8h0r2xny1aa3nkrbyl4kvmamx49m3cvyv9kcnvabs6hhs"; - name = "kmag-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmag-15.11.90.tar.xz"; + sha256 = "07ysgxjahs8r2cni0fy9sidig2sm980rrihl12g75n1v9v10km7y"; + name = "kmag-15.11.90.tar.xz"; }; }; kmahjongg = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmahjongg-15.11.80.tar.xz"; - sha256 = "036wckckjdm1hwpb4lpw5djm41faih22466abmqiw6327dddwysy"; - name = "kmahjongg-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmahjongg-15.11.90.tar.xz"; + sha256 = "18g4ng4a5qf49cb54zbijcywkwazncqcqlq3148h0iib5q24ghpq"; + name = "kmahjongg-15.11.90.tar.xz"; }; }; kmailtransport = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmailtransport-15.11.80.tar.xz"; - sha256 = "0wl27x4z31lpbphx8bsb8kacpnbgcjds4a6ipdgp2xcxqxfixxdl"; - name = "kmailtransport-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmailtransport-15.11.90.tar.xz"; + sha256 = "012ghx7hw6b72zpbgac4cak8azv12i556bvhywkhsw539zk4psqp"; + name = "kmailtransport-15.11.90.tar.xz"; }; }; kmbox = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmbox-15.11.80.tar.xz"; - sha256 = "0ijdzizjc2vz3w684ny8rj92hpjmcsaqmh9q1vp2ffjfvz5qjppm"; - name = "kmbox-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmbox-15.11.90.tar.xz"; + sha256 = "13v3awx4qxdr7vnl1ngm9gs8n9jsk1rqg7fqhlj7daa4h4nvjzas"; + name = "kmbox-15.11.90.tar.xz"; }; }; kmime = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmime-15.11.80.tar.xz"; - sha256 = "1m6n6waap6y9afff5cqldi08dwl5kk002y13m8l8yjxk056qgw06"; - name = "kmime-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmime-15.11.90.tar.xz"; + sha256 = "0yn8x4zi5ra8ykcncy85s764skwcimskhs96jc8qzm8bcdd9pzpf"; + name = "kmime-15.11.90.tar.xz"; }; }; kmines = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmines-15.11.80.tar.xz"; - sha256 = "0h29ibkcwlwj3npmkdwii652n5gwhl8xvm31xng93ap98qaawp1b"; - name = "kmines-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmines-15.11.90.tar.xz"; + sha256 = "1lyjpzfjz6pl1s38xj4186jpl29lvi063fvcmhi9dfny2nkmfa15"; + name = "kmines-15.11.90.tar.xz"; }; }; kmix = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmix-15.11.80.tar.xz"; - sha256 = "0vry36l9rjbq44z022q4m1zgdgmhw9n7yr7920zq0wiq64qpm98w"; - name = "kmix-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmix-15.11.90.tar.xz"; + sha256 = "0gc0139xxw5rm00x8kqyqgkyr4yr48gb17a7x9hxf7qlwydjvvav"; + name = "kmix-15.11.90.tar.xz"; }; }; kmousetool = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmousetool-15.11.80.tar.xz"; - sha256 = "0hby69lj0n5swn4zk8mxiba27g4x8ci1cwcc9pxgbn7yc241zbhb"; - name = "kmousetool-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmousetool-15.11.90.tar.xz"; + sha256 = "1dw7cnd40y1rigv033b6d6q140f56hd9cg1lsv3lg52pgfmdpa3n"; + name = "kmousetool-15.11.90.tar.xz"; }; }; kmouth = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmouth-15.11.80.tar.xz"; - sha256 = "1mi0lm725s22nal01w7jzq4lfybk0qdln84q5yficpx13f7917fn"; - name = "kmouth-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmouth-15.11.90.tar.xz"; + sha256 = "14xbxdrpyc12lgx0l66vfxicz5zy69g0dgljakvd10qhbk5bv7cd"; + name = "kmouth-15.11.90.tar.xz"; }; }; kmplot = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kmplot-15.11.80.tar.xz"; - sha256 = "1979nlcgil7qg334944p439nvq4hnc2nlql321s06dp03a8k6cf5"; - name = "kmplot-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kmplot-15.11.90.tar.xz"; + sha256 = "1dacdvcjkipbk30k3ad4slq50nlik57wg7pc9fj4dbkb22fkwq5q"; + name = "kmplot-15.11.90.tar.xz"; }; }; knavalbattle = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/knavalbattle-15.11.80.tar.xz"; - sha256 = "12wbj8nrzjydykvfj1hgpgmwivsipzd5fw5w9k9yi30bgvnryjxw"; - name = "knavalbattle-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/knavalbattle-15.11.90.tar.xz"; + sha256 = "0rq5whawhc806kcn0lbssscfkgy8khw9bwxybkb9wl0ps6p3za65"; + name = "knavalbattle-15.11.90.tar.xz"; }; }; knetwalk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/knetwalk-15.11.80.tar.xz"; - sha256 = "15w99pigi8q0282j9sl98lddrivdm510q3pk3pm2mwwc7pi9gpc9"; - name = "knetwalk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/knetwalk-15.11.90.tar.xz"; + sha256 = "0kp30yjpq84vzj8d4j1f9vzdh6j5rfg2kkzcxzy7xn6a56318c40"; + name = "knetwalk-15.11.90.tar.xz"; }; }; kolf = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kolf-15.11.80.tar.xz"; - sha256 = "1rdj30lyihhn1d64d3k0viw0x1acn3j6cwqjsvzcd50zbhrkcj85"; - name = "kolf-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kolf-15.11.90.tar.xz"; + sha256 = "144cmzkw7dx4ylacmig5828346yyi0kcgn7058qpf9r42v4h06wi"; + name = "kolf-15.11.90.tar.xz"; }; }; kollision = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kollision-15.11.80.tar.xz"; - sha256 = "1hycqsp4j3rargpprfwqshmmr4g4vjd8145a0782ha0cj14ndrr8"; - name = "kollision-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kollision-15.11.90.tar.xz"; + sha256 = "10qparglgiqfbqfvs0r1272q0l8xcscpmv5d883ciss6d4ivw3mw"; + name = "kollision-15.11.90.tar.xz"; }; }; kolourpaint = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kolourpaint-15.11.80.tar.xz"; - sha256 = "1walxy7i9b6anb3sa4nj43m8n4mkcnm87i92fjspb7hm029bj8z1"; - name = "kolourpaint-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kolourpaint-15.11.90.tar.xz"; + sha256 = "0s7r2q97y3f7gdxpff0k1mlscgxz8d1jifpfvs728mwhn821vb3d"; + name = "kolourpaint-15.11.90.tar.xz"; }; }; kompare = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kompare-15.11.80.tar.xz"; - sha256 = "10qvjqvy1dgzw1ywbza8z4ia2hcman0nlha7czy0lr2phf05rw8b"; - name = "kompare-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kompare-15.11.90.tar.xz"; + sha256 = "1f1xs97b6llgi27gv6gd1zcv8bxkw1n46bl2rd0363n789ipdpx8"; + name = "kompare-15.11.90.tar.xz"; }; }; konquest = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/konquest-15.11.80.tar.xz"; - sha256 = "0jkjncr5kb5qdqykvc4wksv5kj75fijnb6mzahx6ivcgaxp4jff8"; - name = "konquest-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/konquest-15.11.90.tar.xz"; + sha256 = "0f3hqk7lf1h7wbc4qvn6j662qw1g6vmrbr2995rar37bzr2x7g20"; + name = "konquest-15.11.90.tar.xz"; }; }; konsole = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/konsole-15.11.80.tar.xz"; - sha256 = "0vgzqnd27ab48rc6mb8hqhr8yk0qf8ygz0mgbhz4aswwk08dm0k0"; - name = "konsole-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/konsole-15.11.90.tar.xz"; + sha256 = "1xh5sw0qdffxs7rbxpai25p4ri7pf6n69c9f9d6zkrpwqrnbnyvn"; + name = "konsole-15.11.90.tar.xz"; }; }; kontactinterface = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kontactinterface-15.11.80.tar.xz"; - sha256 = "0ywjvwx3y007mi1g0r9gq1vrcqdfgipk5jralxb91mzxrml2af8a"; - name = "kontactinterface-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kontactinterface-15.11.90.tar.xz"; + sha256 = "10lzs4pwcqhd58mpgiayi0z24x03z21fz1k56di37c40p829v50m"; + name = "kontactinterface-15.11.90.tar.xz"; }; }; kopete = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kopete-15.11.80.tar.xz"; - sha256 = "0jk39agyl9nx4gkwff23aiq3lmnaz4w9xcfbhm906p7072ma82zj"; - name = "kopete-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kopete-15.11.90.tar.xz"; + sha256 = "0f8xazwhvi7jarx4rnlw9sggvdy9a02577919f5prvm7cp29k0g8"; + name = "kopete-15.11.90.tar.xz"; }; }; kpat = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kpat-15.11.80.tar.xz"; - sha256 = "07vchzgf5g92g6zf9slg3x0166fs9s6imysvs2lhin9adwawpbfj"; - name = "kpat-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kpat-15.11.90.tar.xz"; + sha256 = "09fpnss71xg62crm6vw6iw16p7z6x8d39jn8ydwzp9dqw351x0dq"; + name = "kpat-15.11.90.tar.xz"; }; }; kpimtextedit = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kpimtextedit-15.11.80.tar.xz"; - sha256 = "1lx2a183p97ixx65f4aqn0k5avb124sm2rzgpj5mjnhqwxfc3fs7"; - name = "kpimtextedit-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kpimtextedit-15.11.90.tar.xz"; + sha256 = "06zicz9d0807vmqyryv19wmgnw2w2nvfrsp7ca74mzybi9j18rvh"; + name = "kpimtextedit-15.11.90.tar.xz"; }; }; kppp = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kppp-15.11.80.tar.xz"; - sha256 = "1j2kyp3jagp2grhbp5hcszq7h3lz43x8k2mfh5cahfkkzn88yqws"; - name = "kppp-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kppp-15.11.90.tar.xz"; + sha256 = "1q332n00fak1jz3ksn1fnyvyi9mz80h9ylzgn8r9mr7v7lpz5x3r"; + name = "kppp-15.11.90.tar.xz"; }; }; kqtquickcharts = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kqtquickcharts-15.11.80.tar.xz"; - sha256 = "1ssbljhwj5idci7z9hd70pv7b7bmrc87x4k0fxpqayclgwi0iijf"; - name = "kqtquickcharts-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kqtquickcharts-15.11.90.tar.xz"; + sha256 = "1slyjj7np7k70ddrnw6clqzpwfdci722vsgxzwsripgwcdk7915x"; + name = "kqtquickcharts-15.11.90.tar.xz"; }; }; krdc = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/krdc-15.11.80.tar.xz"; - sha256 = "1vhd01zf8w8555pp6b5d9vn92y0nm4r4cksiwvklqsrlv4p3yscc"; - name = "krdc-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/krdc-15.11.90.tar.xz"; + sha256 = "0qsm3m8ry07lkqkbbk5wy2b7vnaamdmgqvcbv193fnj2w62gcfmi"; + name = "krdc-15.11.90.tar.xz"; }; }; kremotecontrol = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kremotecontrol-15.11.80.tar.xz"; - sha256 = "19hmq74nx074h5vhdcxkdqqdz58vkwpspc3dbyk8lypwd28xb09d"; - name = "kremotecontrol-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kremotecontrol-15.11.90.tar.xz"; + sha256 = "0kapm1kmr4pwy4qaz4rsh22rji4w9nz2a79gmzcdkq51srs6iv7f"; + name = "kremotecontrol-15.11.90.tar.xz"; }; }; kreversi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kreversi-15.11.80.tar.xz"; - sha256 = "1zd3lds1rrvbwxrv7qm2pm4pb0ki8szzv1bxpf18kywvw6kb40cr"; - name = "kreversi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kreversi-15.11.90.tar.xz"; + sha256 = "0swmh832irdg1dxdy0kvvn2ph4ic9yis15v3bf95rl0vbhz3892w"; + name = "kreversi-15.11.90.tar.xz"; }; }; krfb = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/krfb-15.11.80.tar.xz"; - sha256 = "10873di286pgzadlrz4c96b4j2kajxin2wmys7y2lbv6cf0vya2i"; - name = "krfb-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/krfb-15.11.90.tar.xz"; + sha256 = "17rj7hgqm0w5s05g35mnsjdp12vxmrx1kzg4iiwa4x74fhhahgcd"; + name = "krfb-15.11.90.tar.xz"; }; }; kross-interpreters = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kross-interpreters-15.11.80.tar.xz"; - sha256 = "0zl0f3gh80inmb2wv1jpsxqd0pqaiaa6hkma756mhgxjb90shz3m"; - name = "kross-interpreters-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kross-interpreters-15.11.90.tar.xz"; + sha256 = "0wbbfxfa7i8brrpah2a3w01jljwlfpznbw1biayq4m2wh4s1zfbc"; + name = "kross-interpreters-15.11.90.tar.xz"; }; }; kruler = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kruler-15.11.80.tar.xz"; - sha256 = "188mya8phcjlp1a8cf2mkkmrg38bwgclgqm36wk181f03cvrqwhi"; - name = "kruler-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kruler-15.11.90.tar.xz"; + sha256 = "1frrinlkc9pp7y99jf5xlrzphh00i68jdxpgkqjfmsdf1ifm3xp1"; + name = "kruler-15.11.90.tar.xz"; }; }; ksaneplugin = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksaneplugin-15.11.80.tar.xz"; - sha256 = "1n42i649vcgmv80vacvf1xwa99ay1sz1csi6jc1y09qk83cwdfpa"; - name = "ksaneplugin-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksaneplugin-15.11.90.tar.xz"; + sha256 = "1vkbbpack87rg20ab4byp8hgwgi7dws375lk6pkx29gq091blnby"; + name = "ksaneplugin-15.11.90.tar.xz"; }; }; kscd = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kscd-15.11.80.tar.xz"; - sha256 = "1xgb7qvqhg9mlxi09ggqs2l6ybs6wilabp6hbzk1r1zqf44fvvh1"; - name = "kscd-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kscd-15.11.90.tar.xz"; + sha256 = "1c7rq1p7n2p15yl21x9pmd80w3b7zl4k839jw8i02aidllbkm252"; + name = "kscd-15.11.90.tar.xz"; }; }; kshisen = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kshisen-15.11.80.tar.xz"; - sha256 = "0wzran4wdb4zjf4qzj08hzzf3mqzi6dds0yhfv2mwwpw59bba2y4"; - name = "kshisen-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kshisen-15.11.90.tar.xz"; + sha256 = "0hl0xbf6s44rjwk34kvm4l2i91w4yd60pcxc7hqc9aq5mwmdxwqn"; + name = "kshisen-15.11.90.tar.xz"; }; }; ksirk = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksirk-15.11.80.tar.xz"; - sha256 = "0ciab5mxqli299x084cig8vrlxsirzjvqxzmvk6pz0jf4g8jl797"; - name = "ksirk-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksirk-15.11.90.tar.xz"; + sha256 = "0wpjwp5p9hna0n3dp5x0pjx18pq16vvhmq84sbar7qm289v5j6si"; + name = "ksirk-15.11.90.tar.xz"; }; }; ksnakeduel = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksnakeduel-15.11.80.tar.xz"; - sha256 = "1p0fcjm06a9klb9hrclxs5jskflfb5c3ix7w3b23ql1798nml4f3"; - name = "ksnakeduel-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksnakeduel-15.11.90.tar.xz"; + sha256 = "020sm6vff3zx36cx8h24y51a8r68h2h354j4p33wanmj8w3lsjdy"; + name = "ksnakeduel-15.11.90.tar.xz"; }; }; kspaceduel = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kspaceduel-15.11.80.tar.xz"; - sha256 = "116bjbp5771p6plvamd8iybnj3cx2xi07qhrd2ky8jbxrbbzvmya"; - name = "kspaceduel-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kspaceduel-15.11.90.tar.xz"; + sha256 = "0hs4yxp3zhxhrlq3wrl0kgiamwlamyyd70h5xpqcvl8kfqavggik"; + name = "kspaceduel-15.11.90.tar.xz"; }; }; ksquares = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksquares-15.11.80.tar.xz"; - sha256 = "0k3h1r5h8bdvs7sk39nh371pdibgl8xmgp3w0xj95q3ya6587zqg"; - name = "ksquares-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksquares-15.11.90.tar.xz"; + sha256 = "0zqb0xlmp3k9s0i6iyd55dp99z2vglnjnwib49vrkh0rmbq3xcn9"; + name = "ksquares-15.11.90.tar.xz"; }; }; kstars = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kstars-15.11.80.tar.xz"; - sha256 = "1djzvsk91hpxlnmymn1148lr9kdyvwsn2krfrs8wg3f2wy20shjr"; - name = "kstars-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kstars-15.11.90.tar.xz"; + sha256 = "0c5fx1z83plfkimnh7ykfq8a0zvivfbpw6j2m4ssi0bxlan9kphd"; + name = "kstars-15.11.90.tar.xz"; }; }; ksudoku = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksudoku-15.11.80.tar.xz"; - sha256 = "0cv9ax2iarz5fy46jp53sgmqw58maasnmp8zky8sm0xz4slphcmq"; - name = "ksudoku-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksudoku-15.11.90.tar.xz"; + sha256 = "0qf7ia9pq6pv2hpwx4zs21w6bx38c9kman6i7qrbs09fd6chndf9"; + name = "ksudoku-15.11.90.tar.xz"; }; }; ksystemlog = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ksystemlog-15.11.80.tar.xz"; - sha256 = "0iah8676h10y5dlw4n9qxy0kxp7n7wzwkvkgvmxzapzvxly2jpdl"; - name = "ksystemlog-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ksystemlog-15.11.90.tar.xz"; + sha256 = "1flpy7sssbl5mn0gzpx2053wncylj6ak89jx6gsldq16w5yf7qhr"; + name = "ksystemlog-15.11.90.tar.xz"; }; }; kteatime = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kteatime-15.11.80.tar.xz"; - sha256 = "0ylkhi0i3w7m4jn3bdvnq0wvamj546mk4dggd4ivkwbbf1csbwi2"; - name = "kteatime-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kteatime-15.11.90.tar.xz"; + sha256 = "07zpjx4nilp3ldnbh9rx8y70xdpbjfhrdc2drg87z2ywrf8kmv64"; + name = "kteatime-15.11.90.tar.xz"; }; }; ktimer = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktimer-15.11.80.tar.xz"; - sha256 = "0jv5xzpczwz6mrp2dpynq5bfa90my6pdrndjrz7qa09g9zi9k0wk"; - name = "ktimer-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktimer-15.11.90.tar.xz"; + sha256 = "0xgkan0a4gz37vqby8hjra0jylma8l586dr38gf8blm8vc4qw58g"; + name = "ktimer-15.11.90.tar.xz"; }; }; ktnef = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktnef-15.11.80.tar.xz"; - sha256 = "0s1x877vrzhjyxvm317i0xyc589awkfgyq6cp3yjr3sdyb21bklr"; - name = "ktnef-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktnef-15.11.90.tar.xz"; + sha256 = "136hb86lp4qd9kzm63876gf9wllqh6mkciqq9lflrc1f4csy3h3l"; + name = "ktnef-15.11.90.tar.xz"; }; }; ktouch = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktouch-15.11.80.tar.xz"; - sha256 = "1ys3flgmwqryvk39b8405gf2v8qdj9prz7iz9kx0ncb353fz1fd0"; - name = "ktouch-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktouch-15.11.90.tar.xz"; + sha256 = "0fa2zlk1546xgv5q9nbcymfpizrppllla1yhm46fh1rrhxv8spaw"; + name = "ktouch-15.11.90.tar.xz"; }; }; ktp-accounts-kcm = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-accounts-kcm-15.11.80.tar.xz"; - sha256 = "0kdc96lxzyp7gc9iva6q0dawcw1naw0rdzmcvr254dvk5pwz8wcq"; - name = "ktp-accounts-kcm-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-accounts-kcm-15.11.90.tar.xz"; + sha256 = "1gcj320221h7b3c20vcpbgqpgw61zfw3zf9ryl1b3cxdfnvqnzzl"; + name = "ktp-accounts-kcm-15.11.90.tar.xz"; }; }; ktp-approver = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-approver-15.11.80.tar.xz"; - sha256 = "03f39h4ppwy92w18wn2n4m5gwiryahj49nmbcsfhvha0va0892fa"; - name = "ktp-approver-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-approver-15.11.90.tar.xz"; + sha256 = "1gi72mj8p9rq051hdj574mr51445nzl3wpcb2az145igbdyh97d4"; + name = "ktp-approver-15.11.90.tar.xz"; }; }; ktp-auth-handler = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-auth-handler-15.11.80.tar.xz"; - sha256 = "0wcz1wjz2r3r86cfvp2wyfcbnvar0alyil7zv8hizzyickwsb3y7"; - name = "ktp-auth-handler-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-auth-handler-15.11.90.tar.xz"; + sha256 = "042p5s416a4208wksvqzhh2cwxncgh0vljp45i2isy7bcxdcqnan"; + name = "ktp-auth-handler-15.11.90.tar.xz"; }; }; ktp-common-internals = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-common-internals-15.11.80.tar.xz"; - sha256 = "1gq6mpa0mrfyiv9kiyy39fh28xvwj9vivn3p8nhx5zmai37l5ds4"; - name = "ktp-common-internals-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-common-internals-15.11.90.tar.xz"; + sha256 = "0lxd4brfv1ib9y9pgs5dig18pmsqpj9php785xj2n3lpqjjmyw9z"; + name = "ktp-common-internals-15.11.90.tar.xz"; }; }; ktp-contact-list = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-contact-list-15.11.80.tar.xz"; - sha256 = "14az86dv3jmb5x26vgn2wqnys77nz9rjscp6n6hvpqcyp6g5h075"; - name = "ktp-contact-list-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-contact-list-15.11.90.tar.xz"; + sha256 = "1x40rx4xhcznhhhb0lmr860hdspr0jj5kjd8kl9si2rb8355ddpq"; + name = "ktp-contact-list-15.11.90.tar.xz"; }; }; ktp-contact-runner = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-contact-runner-15.11.80.tar.xz"; - sha256 = "0qp7mgn46favlz1a9xv9rv4pbykmc5m5csv3mbrq6pndpihdfbxq"; - name = "ktp-contact-runner-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-contact-runner-15.11.90.tar.xz"; + sha256 = "0fshmq6m3w3srwzy42p4sxl6ha94950b4mz7jv9gijr6z9gjm4hf"; + name = "ktp-contact-runner-15.11.90.tar.xz"; }; }; ktp-desktop-applets = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-desktop-applets-15.11.80.tar.xz"; - sha256 = "1l6z58g0p5xlc0l9z9xgkw3sv7jx4kdwp8jpx1v8m513r8szfwgg"; - name = "ktp-desktop-applets-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-desktop-applets-15.11.90.tar.xz"; + sha256 = "1nn1kmx6dxcpfra98d9nk9y942s0jcivl35fx4r1wwa33ky33sch"; + name = "ktp-desktop-applets-15.11.90.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-filetransfer-handler-15.11.80.tar.xz"; - sha256 = "019h5q83593yg2mgknv8yzfq3bl2vjfkf0dwv7mb6ykf6bsb9630"; - name = "ktp-filetransfer-handler-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-filetransfer-handler-15.11.90.tar.xz"; + sha256 = "0mq5s3fwb865jd0a6yw0cvipbia2bnhqs1h9ybsxs03q9ywwdfnk"; + name = "ktp-filetransfer-handler-15.11.90.tar.xz"; }; }; ktp-kded-module = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-kded-module-15.11.80.tar.xz"; - sha256 = "1mf9mya8r6lrmbr26pdp9d7hdp1irsba46zlr859hjl6pqa10i3b"; - name = "ktp-kded-module-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-kded-module-15.11.90.tar.xz"; + sha256 = "1mrrx8kl5i7gcb21mqy18iycz34hdzlg236hgk3pbv7ykwrwxibq"; + name = "ktp-kded-module-15.11.90.tar.xz"; }; }; ktp-send-file = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-send-file-15.11.80.tar.xz"; - sha256 = "1d265x89854xvxdxqa9z37r6m13kiplawkxq5l4cy5hlwmvp3ivm"; - name = "ktp-send-file-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-send-file-15.11.90.tar.xz"; + sha256 = "0kfh389zwp8ckkjcs24ffzmxhzxb73jdpcjd9iyb0xzrhc2n8gpl"; + name = "ktp-send-file-15.11.90.tar.xz"; }; }; ktp-text-ui = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktp-text-ui-15.11.80.tar.xz"; - sha256 = "0mixwwqwx4z8m0kaj0wfn5zczq08w18ascl9r78mvx6p1946m86q"; - name = "ktp-text-ui-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktp-text-ui-15.11.90.tar.xz"; + sha256 = "1jx9s356z2yrz9ir6xhf7qyllnr2yqby9cpchsb5fkhy4g4dfs6j"; + name = "ktp-text-ui-15.11.90.tar.xz"; }; }; ktuberling = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/ktuberling-15.11.80.tar.xz"; - sha256 = "1gpsimdx0l9ml9f8nfqbqm2jmj60w3bni1s23iyc62b96pazx9a4"; - name = "ktuberling-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/ktuberling-15.11.90.tar.xz"; + sha256 = "0im0qypwysznjgam115bnqbqsa0rk2z29mwh173lv4gy6dpiyrl4"; + name = "ktuberling-15.11.90.tar.xz"; }; }; kturtle = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kturtle-15.11.80.tar.xz"; - sha256 = "13z9rsk0ikg1q312wkag8njgw5921nhfmd57bdfa6p0w971wndm4"; - name = "kturtle-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kturtle-15.11.90.tar.xz"; + sha256 = "1hqp0cdk2gjrfyjwqmd7r4d8ghwwvz61z6yal8bwidam3dll6p63"; + name = "kturtle-15.11.90.tar.xz"; }; }; kubrick = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kubrick-15.11.80.tar.xz"; - sha256 = "11kccqc8vs6cvwzabq80bwyn4f1qypln807m7xx5g3p07qzplc28"; - name = "kubrick-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kubrick-15.11.90.tar.xz"; + sha256 = "0w3184cv8qi0q61ba8hlkj05vbzgpi3rl5sfqyk3wv86vl7vr31d"; + name = "kubrick-15.11.90.tar.xz"; }; }; kuser = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kuser-15.11.80.tar.xz"; - sha256 = "0ima6v48i0cd1kizadla6zm40hdmdp3b4phq8lmai1vqhy9890h8"; - name = "kuser-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kuser-15.11.90.tar.xz"; + sha256 = "18033k08p9qmzg1q4s9wi4rv1kb4c19byvkylmkgab48i2ksp946"; + name = "kuser-15.11.90.tar.xz"; }; }; kwalletmanager = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kwalletmanager-15.11.80.tar.xz"; - sha256 = "1fg9qjlb12wnxrdz9f6yvvs4ybwwwp3n73nsmq6igms2rw00ixaf"; - name = "kwalletmanager-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kwalletmanager-15.11.90.tar.xz"; + sha256 = "0h9a2jy4sbpys3frx55gi1zj8r5ysg55lj2bckmd6f3pk9z7h38b"; + name = "kwalletmanager-15.11.90.tar.xz"; }; }; kwordquiz = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/kwordquiz-15.11.80.tar.xz"; - sha256 = "00pv1q2d0ccihwbvsk51hblzc2vvnw81lrla7a77bdgk266b2q3c"; - name = "kwordquiz-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/kwordquiz-15.11.90.tar.xz"; + sha256 = "1zlq2m2y3z2s1rw74gb7rgwrin4i449z3vqdglgxq6376rzffvx7"; + name = "kwordquiz-15.11.90.tar.xz"; }; }; libkcddb = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkcddb-15.11.80.tar.xz"; - sha256 = "0dm8vi0h84zm84jjqrlgpc5n8shwlipd3dmm3ndl31jx3wmm4cca"; - name = "libkcddb-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkcddb-15.11.90.tar.xz"; + sha256 = "0dsnfkhmwvhp56adh07r1pl3m7045na9xmz065ykmnfb8s4czqyv"; + name = "libkcddb-15.11.90.tar.xz"; }; }; libkcompactdisc = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkcompactdisc-15.11.80.tar.xz"; - sha256 = "0q6yvjzjlkc5pmjqrxphk4n7va6hcr903vkamvnbhn559qv3j11x"; - name = "libkcompactdisc-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkcompactdisc-15.11.90.tar.xz"; + sha256 = "1rbhv1fl423swl93sm9vgmqvx1sd3m0337jcjdch3siw3wl1wfff"; + name = "libkcompactdisc-15.11.90.tar.xz"; }; }; libkdcraw = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkdcraw-15.11.80.tar.xz"; - sha256 = "1s7cz3wh4066wyixbzvczba94v5fizwmcnl6waazgnabr8djy75r"; - name = "libkdcraw-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkdcraw-15.11.90.tar.xz"; + sha256 = "0lsk89rdx9awsh4mv3m93z0556bmxb1yk68c6aqhryz2ggl6xkld"; + name = "libkdcraw-15.11.90.tar.xz"; }; }; libkdeedu = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkdeedu-15.11.80.tar.xz"; - sha256 = "0xmfv692x6s6c350l324mi69512sbmqscx26hv3827sm02lxi3nj"; - name = "libkdeedu-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkdeedu-15.11.90.tar.xz"; + sha256 = "13w3ar3lklbpzd4mg77hab1hqs30jxn5avfr841chp5wpdlr38l1"; + name = "libkdeedu-15.11.90.tar.xz"; }; }; libkdegames = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkdegames-15.11.80.tar.xz"; - sha256 = "1pkl30ijnbmzc8gs1ib5l7qvmnb2a59smakaipji2n6pcik5xdi5"; - name = "libkdegames-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkdegames-15.11.90.tar.xz"; + sha256 = "1rswaag39jy2qvr1c5p41crr3151i6wqrfrscvf3zgbfs33vgmv7"; + name = "libkdegames-15.11.90.tar.xz"; }; }; libkeduvocdocument = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkeduvocdocument-15.11.80.tar.xz"; - sha256 = "0p7mbw5xm7ywrz36rs8xpcnjm4w844jgjcciv0r4qwbpvcxm38kh"; - name = "libkeduvocdocument-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkeduvocdocument-15.11.90.tar.xz"; + sha256 = "1gvrj0sw7v976r449q05i6syvcadcmbfvs51kbrz30dfshjlddrk"; + name = "libkeduvocdocument-15.11.90.tar.xz"; }; }; libkexiv2 = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkexiv2-15.11.80.tar.xz"; - sha256 = "0pis24db80l9w62v6axy9137rdgpsdlfrzf9k3yi63x0qs037k5c"; - name = "libkexiv2-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkexiv2-15.11.90.tar.xz"; + sha256 = "1kwcxjqds68f37rml334swk0aawla0hia4bzyaf57yhwzd1v9vcj"; + name = "libkexiv2-15.11.90.tar.xz"; }; }; libkface = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkface-15.11.80.tar.xz"; - sha256 = "0mr52fn3j71y0qaxn4wdz7lrk8ylmlj965jvilgzpnf97jdhy8bc"; - name = "libkface-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkface-15.11.90.tar.xz"; + sha256 = "071nc8vr7rwwkfzcsmldqj2ycgn5y1mq990w21rf6i0iizilqsd9"; + name = "libkface-15.11.90.tar.xz"; }; }; libkgeomap = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkgeomap-15.11.80.tar.xz"; - sha256 = "1nwzakm5njilqpa7fslgz4gcy02b1kzhnrckm867qavn8qmy0j56"; - name = "libkgeomap-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkgeomap-15.11.90.tar.xz"; + sha256 = "0is45slxb3arkrr1w56bc3ynvvdmlm8am92gpyl5pv915l4d4lbb"; + name = "libkgeomap-15.11.90.tar.xz"; }; }; libkipi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkipi-15.11.80.tar.xz"; - sha256 = "1qmpbrmpm8hbrfwjihpg3gks177cvwc99rmb9bvphi2q8xg49xzn"; - name = "libkipi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkipi-15.11.90.tar.xz"; + sha256 = "1kfyci0w2dxdsshkak1xffh7zy32j08p64i8nvfzmc92zrj1h1j4"; + name = "libkipi-15.11.90.tar.xz"; }; }; libkmahjongg = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkmahjongg-15.11.80.tar.xz"; - sha256 = "192az0z4hwqcn8j02g17fxc44blv615vn345svrxbmxinr1cc18q"; - name = "libkmahjongg-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkmahjongg-15.11.90.tar.xz"; + sha256 = "1lmdjcmx495c8f6idwxjjqdyzq4xlfdij6dmxqbnbjx4l398116r"; + name = "libkmahjongg-15.11.90.tar.xz"; }; }; libkomparediff2 = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libkomparediff2-15.11.80.tar.xz"; - sha256 = "1zv6y7j4dna6m51xqs0i3sjd3xxy7bqb8jwrqpjls2fy4x55cnv2"; - name = "libkomparediff2-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libkomparediff2-15.11.90.tar.xz"; + sha256 = "0xdbxzvfbn84gd70zabyvpq63szjxh1zbrdr46ahnh29m2cdk4x2"; + name = "libkomparediff2-15.11.90.tar.xz"; }; }; libksane = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/libksane-15.11.80.tar.xz"; - sha256 = "1ljqv14x29pqzm7nd7rg3p447q188m1266b2sgvyrpvgg340ynrp"; - name = "libksane-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/libksane-15.11.90.tar.xz"; + sha256 = "013h5lx93lz2n9il53dxaxx31n62vlmc884wfi40igkksbg5hm3v"; + name = "libksane-15.11.90.tar.xz"; }; }; lokalize = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/lokalize-15.11.80.tar.xz"; - sha256 = "0n6mg6r3hlm9m19kbw2nrfimjhvf23l33wcfwdb66hq05z5fqacz"; - name = "lokalize-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/lokalize-15.11.90.tar.xz"; + sha256 = "0aw9j7fhni6wrkffjrv8biwsc85mzmcyx7fsm96whwf8xhcs8whp"; + name = "lokalize-15.11.90.tar.xz"; }; }; lskat = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/lskat-15.11.80.tar.xz"; - sha256 = "0c30dcsydvzc469gxbv0y0g1v9mg745ajng18sv9jrsgrc9594vv"; - name = "lskat-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/lskat-15.11.90.tar.xz"; + sha256 = "1n6dmc7vlq9n6wix9fbfnbixjikzpg4hzcqiz8q28qs3lv9kcmxs"; + name = "lskat-15.11.90.tar.xz"; }; }; marble = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/marble-15.11.80.tar.xz"; - sha256 = "1ks031ypb4himg0jiw1vql0isli1hyaz7kmagvby4il7cw4gdgf3"; - name = "marble-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/marble-15.11.90.tar.xz"; + sha256 = "0xxf7s36m5p88y0xs44j4fn867dfj0qzvhfaqp9drhwc604f4l2i"; + name = "marble-15.11.90.tar.xz"; }; }; mplayerthumbs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/mplayerthumbs-15.11.80.tar.xz"; - sha256 = "0snn5jmpsyczxxyfp5ka5mkymldy7pjb2jqjc092aci6w1mmkvsd"; - name = "mplayerthumbs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/mplayerthumbs-15.11.90.tar.xz"; + sha256 = "181brlsn21wyzjhb7krf6dx23n8fc2vbzxjz42v13lpvidzw85dk"; + name = "mplayerthumbs-15.11.90.tar.xz"; }; }; okteta = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/okteta-15.11.80.tar.xz"; - sha256 = "06334p934fyajaqg7pz8wqyzcmghymhanfnyz6y1cqaqrkf16n0s"; - name = "okteta-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/okteta-15.11.90.tar.xz"; + sha256 = "1l0bpv2xv4l0ccddwg751lg91d9d4bsx3ri1ljp248rw1phgzhjl"; + name = "okteta-15.11.90.tar.xz"; }; }; okular = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/okular-15.11.80.tar.xz"; - sha256 = "0ny8r7shnl7qjdzb0m9rmcq3y7scpfycxz7rcxv8x52v0vqkqgh8"; - name = "okular-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/okular-15.11.90.tar.xz"; + sha256 = "0cismifga8difq4s5xxh05cjwfck6a2v3qmijrndy4s442cyhlr6"; + name = "okular-15.11.90.tar.xz"; }; }; palapeli = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/palapeli-15.11.80.tar.xz"; - sha256 = "02w0m3piw15x0bmkh6ap6il13yj5r0kszwrq47k6ildl96a0zbdd"; - name = "palapeli-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/palapeli-15.11.90.tar.xz"; + sha256 = "09vihdgm05kd61mgwdy50l6ir7s3knngfm3ywf6l6q40bsv3caz4"; + name = "palapeli-15.11.90.tar.xz"; }; }; parley = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/parley-15.11.80.tar.xz"; - sha256 = "06na0w14f5r322ybn38qal57arrjv3brlbmlb4bw196467cw773i"; - name = "parley-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/parley-15.11.90.tar.xz"; + sha256 = "08wzvdkhrj8mp38dl0r2n56xi4vcgbsxsfbislfk1b5c5dkzm00d"; + name = "parley-15.11.90.tar.xz"; }; }; picmi = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/picmi-15.11.80.tar.xz"; - sha256 = "1m5b0ziz0pa7j5awis78brx1dsp8rwpg08lbkjvr09l20xb0n0mj"; - name = "picmi-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/picmi-15.11.90.tar.xz"; + sha256 = "1w19b3c566p8gsz94gl9ld2f0ck6izaq84rcirmkiah5yg2hjxvi"; + name = "picmi-15.11.90.tar.xz"; }; }; poxml = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/poxml-15.11.80.tar.xz"; - sha256 = "1p7h7q0dgynyd1187bgavfbpgn2g8km8rf8gzwya7wn8nz152xff"; - name = "poxml-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/poxml-15.11.90.tar.xz"; + sha256 = "1gcih023rdjabx061vqc0hrjnbyqpwx8wrcjaznwdl42kmkjbdjn"; + name = "poxml-15.11.90.tar.xz"; }; }; print-manager = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/print-manager-15.11.80.tar.xz"; - sha256 = "102h4h4qk0hnkak1sh5bmbvhnrr2bhrsqs45j1zyql0na63b5gy1"; - name = "print-manager-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/print-manager-15.11.90.tar.xz"; + sha256 = "0ayl181d507yfgr1cqb49ih5394hjqm3kda59217jg0q9cjnfclc"; + name = "print-manager-15.11.90.tar.xz"; }; }; rocs = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/rocs-15.11.80.tar.xz"; - sha256 = "0i05lsvzbcsxqr70a2xsdgq6j5xcbm54g4jw0ifh3jvpr0yrmgb4"; - name = "rocs-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/rocs-15.11.90.tar.xz"; + sha256 = "1mpnk6bazn3255fi0q5licq5gggwb8vgwnq35l16h6fl8v92fd43"; + name = "rocs-15.11.90.tar.xz"; }; }; signon-kwallet-extension = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/signon-kwallet-extension-15.11.80.tar.xz"; - sha256 = "0crq69px0gbcw7h6bgbjad35djh3lm9jniblj6avkz8plj0j16z5"; - name = "signon-kwallet-extension-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/signon-kwallet-extension-15.11.90.tar.xz"; + sha256 = "0l532904s209r9667vb566gm64z4ij7pzkr9m4x8hgk0cj72pygx"; + name = "signon-kwallet-extension-15.11.90.tar.xz"; }; }; spectacle = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/spectacle-15.11.80.tar.xz"; - sha256 = "1p39qxr67iy6lda2j9ar0aq1sg29gp9ds29aqbs3rx9m56rn8h6q"; - name = "spectacle-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/spectacle-15.11.90.tar.xz"; + sha256 = "16d6rg6fi5myb8hndj6xdcpwk8km4dnwqz2i5mfxzs29v2lgwmwl"; + name = "spectacle-15.11.90.tar.xz"; }; }; step = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/step-15.11.80.tar.xz"; - sha256 = "0ggm9rqzjw1aljhmxnc6n428zkp0c1ik3lldaxi576z5ipvvgwnd"; - name = "step-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/step-15.11.90.tar.xz"; + sha256 = "05dik7s4g0amw4bxk3kmfc19yfvd24qd1yxvs9w68bwdsikwwxix"; + name = "step-15.11.90.tar.xz"; }; }; svgpart = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/svgpart-15.11.80.tar.xz"; - sha256 = "0fq69li2z2nqj0xrsd010d9gfpc39r8k5fxbzlfravi12big0yhk"; - name = "svgpart-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/svgpart-15.11.90.tar.xz"; + sha256 = "0pcb32bpp97iwa3cg4m0wcgsw6zvh00mgl5bmp7kildlsj5nal0c"; + name = "svgpart-15.11.90.tar.xz"; }; }; sweeper = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/sweeper-15.11.80.tar.xz"; - sha256 = "1yw1f1j2qzzpqzr3iz0fyi8kmd369i94gx0njv2iqm1jakk1hqfc"; - name = "sweeper-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/sweeper-15.11.90.tar.xz"; + sha256 = "1w3s7j0djggmlwgh5874n58ni8sx8dc348qm792p068d661mn1qz"; + name = "sweeper-15.11.90.tar.xz"; }; }; syndication = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/syndication-15.11.80.tar.xz"; - sha256 = "06y5wz7asa4f1a7j7arhggwyv5cikn52d0h38ybxa9vjcmkn5nw5"; - name = "syndication-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/syndication-15.11.90.tar.xz"; + sha256 = "0f4bp5clqkl5kylz7agr85xazpvs83vmhk4qrkjz0brwfy9k9n8s"; + name = "syndication-15.11.90.tar.xz"; }; }; umbrello = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/umbrello-15.11.80.tar.xz"; - sha256 = "1kpag8f6r3cfp77z8lb8hbpq2djqg718bs6hs8wi99y2zy85xwr6"; - name = "umbrello-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/umbrello-15.11.90.tar.xz"; + sha256 = "02byr3977hdckjps8460rjgaz7fs2rbbfki1mds0h6b1ih2nwwmf"; + name = "umbrello-15.11.90.tar.xz"; }; }; zeroconf-ioslave = { - version = "15.11.80"; + version = "15.11.90"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.80/src/zeroconf-ioslave-15.11.80.tar.xz"; - sha256 = "1kpahrs8p9l52hgkm3whryvwcbw9fzn4l4yxq93ijzac0m8gpqwr"; - name = "zeroconf-ioslave-15.11.80.tar.xz"; + url = "${mirror}/unstable/applications/15.11.90/src/zeroconf-ioslave-15.11.90.tar.xz"; + sha256 = "0ldbdfhmzf58is7ygs10if2kjajw77ngaiq7qgvz7b97ssvl8xm3"; + name = "zeroconf-ioslave-15.11.90.tar.xz"; }; }; } From 623a117bdd6491cb81ca7504c19d0fa2fd785af3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 17:25:56 -0600 Subject: [PATCH 328/498] makeDesktopItem: add StartupNotify key --- pkgs/build-support/make-desktopitem/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 1a03faae54c..d4baf17adf1 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -9,6 +9,7 @@ , genericName , mimeType ? "" , categories ? "Application;Other;" +, startupNotify ? null }: stdenv.mkDerivation { @@ -26,6 +27,8 @@ stdenv.mkDerivation { GenericName=${genericName} MimeType=${mimeType} Categories=${categories} - EOF + ${if startupNotify == null then ''EOF'' else '' + StartupNotify=${startupNotify} + EOF''} ''; } From 7cdedaaf728ead99294ad6995133e380d8e453fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 17:26:41 -0600 Subject: [PATCH 329/498] dropbox: use fields from upstream's desktop item --- pkgs/applications/networking/dropbox/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 7a615277d2c..69ebdb429ff 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -45,10 +45,11 @@ let desktopItem = makeDesktopItem { name = "dropbox"; exec = "dropbox"; - comment = "Online directories"; + comment = "Sync your files across computers and to the web"; desktopName = "Dropbox"; - genericName = "Online storage"; - categories = "Application;Internet;"; + genericName = "File Synchronizer"; + categories = "Network;FileTransfer;"; + startupNotify = "false"; }; in stdenv.mkDerivation { From 02b568414d509b5d06dbd95bcc0868d487ed359e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 12 Dec 2015 23:40:11 +0100 Subject: [PATCH 330/498] nixos/test-instrumentation: Set vm.min_free_kbytes We hit page allocation failures a lot at random for VM tests, in case of my own Hydra when it comes to the installer tests. The reason for this is that once the memory of the VM gets heavily fragmented the kernel is unable to allocate new pages. Setting vm.min_free_kbytes to 16MB forces the kernel to keep a minimum of 16 MB free. I've done some testing accross repeated runs of the installer tests with and without vm.min_free_kbytes set. So accross 30 test runs for each settings, all of the tests with the option being set passed while 14 tests without that sysctl option triggered page allocation failures. Sure, running 30 tests is not a guarantee that 16MB is enough, but we'll see how it turns out in the long run across all VM tests. Signed-off-by: aszlig --- nixos/modules/testing/test-instrumentation.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index f37bbd0246d..c1dbfe305dd 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -88,6 +88,10 @@ let kernel = config.boot.kernelPackages.kernel; in boot.consoleLogLevel = 7; + # Make sure we don't hit page allocation failures if the VM's memory is + # heavily fragmented. + boot.kernel.sysctl."vm.min_free_kbytes" = 16384; + # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 150 ""; networking.nameservers = mkOverride 150 [ ]; From fb37fc631ae299ed5f2d515b420cef13bb0e2a26 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 13 Dec 2015 05:36:10 +0100 Subject: [PATCH 331/498] systemd: Apply VirtualBox fix for detect-virt. The update is basically just one additional commit, which was an upstream cherry-pick pushed at NixOS/systemd#3 and it fixes systemd-detect-virt with VirtualBox so that services with ConditionVirtualization set to "oracle" will work properly. I've tested this with the "virtualbox" NixOS VM test, which was failing since the update to version 228. Signed-off-by: aszlig --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 35bd117f0bb..54c04a8b3f2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "17c30663f79499ad0163c7ffe2c79e5c28525a6f"; - sha256 = "0jyqwqyh7l2qp7k4h83gzzp9bgijz0bx02jhd0063jcl1s2amlnh"; + rev = "e9a321e25fe31f0fd2ec0cc28088172ebf819c7e"; + sha256 = "0cgdnzq60ji7kk27xk4scsjkghgzcms7qlqkz3k1cx3r9c8gszz9"; }; outputs = [ "out" "man" "doc" ]; From f01c56f109fee28b282f7eb71ad0398157986865 Mon Sep 17 00:00:00 2001 From: Echo Nolan Date: Sat, 12 Dec 2015 05:57:38 -0800 Subject: [PATCH 332/498] Remove Echo Nolan from maintainers I'm not using Nix anymore. --- lib/maintainers.nix | 1 - .../browsers/mozilla-plugins/flashplayer-11/default.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 596b8a49a10..d1e2b100ab8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -93,7 +93,6 @@ elasticdog = "Aaron Bull Schaefer "; ellis = "Ellis Whitehead "; ehmry = "Emery Hemingway "; - enolan = "Echo Nolan "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index fbf8f95a388..7148764b223 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.enolan ]; + maintainers = []; }; } From 116c230e82427750637e60fe7128c2140fa96a63 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 11:20:57 +0100 Subject: [PATCH 333/498] uritemplate.py: init at 0.3.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c45c0c4061..dcd31693d03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18711,6 +18711,23 @@ in modules // { }; }; + uritemplate_py = buildPythonPackage rec { + name = "uritemplate.py-${version}"; + version = "0.3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/uritemplate.py/${name}.tar.gz"; + sha256 = "0xvvdiwnag2pdi96hjf7v8asdia98flk2rxcjqnwcs3rk99alygx"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/uri-templates/uritemplate-py; + description = "Python implementation of URI Template"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; + }; + traceback2 = buildPythonPackage rec { version = "1.4.0"; name = "traceback2-${version}"; From c0b0cab968afed9fd5d9a986c4b7c9ab07b6a357 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 11:30:13 +0100 Subject: [PATCH 334/498] Revert "Merge branch 'master' of github.com:NixOS/nixpkgs" This reverts commit a7f91d751b440c1fbe169379e63e998bc7e2b384, reversing changes made to 54e0a9b7aca6794f5ce66c28f056761961d3d7d9. --- pkgs/top-level/python-packages.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cac9b0ab6b0..0f76a13d6f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19048,23 +19048,6 @@ in modules // { }; }; - uritemplate_py = buildPythonPackage rec { - name = "uritemplate.py-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/u/uritemplate.py/${name}.tar.gz"; - sha256 = "0xvvdiwnag2pdi96hjf7v8asdia98flk2rxcjqnwcs3rk99alygx"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; - traceback2 = buildPythonPackage rec { version = "1.4.0"; name = "traceback2-${version}"; From 88f9ce0feda8d621dc9e98fbd2aed59c5b7464ee Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 11:44:48 +0100 Subject: [PATCH 335/498] uritemplate.py: init at 0.3.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c79a04b4f36..e4c1920acc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19073,6 +19073,23 @@ in modules // { }; }; + uritemplate_py = buildPythonPackage rec { + name = "uritemplate.py-${version}"; + version = "0.3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/uritemplate.py/${name}.tar.gz"; + sha256 = "0xvvdiwnag2pdi96hjf7v8asdia98flk2rxcjqnwcs3rk99alygx"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/uri-templates/uritemplate-py; + description = "Python implementation of URI Template"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; + }; + traceback2 = buildPythonPackage rec { version = "1.4.0"; name = "traceback2-${version}"; From dc7d09f6a49ff93738b0ee5dd4af9609202e02ee Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 13 Dec 2015 11:00:21 +0000 Subject: [PATCH 336/498] openssl -> openssl_1_0_1 This renames the current openssl to openssl_1_0_1 and defaults openssl back to openssl_1_0_1 essentially changing nothing currently, but allowing people to explicitly select openssl_1_0_1 for some software which needs ABI compatibility to a specific libssl implementation like binaries (spotify amongst others) and at the same time overriding openssl to another implementation like libressl. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c728843286b..0f1e5712631 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8025,7 +8025,8 @@ let wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = callPackage ../development/libraries/openssl { + openssl = openssl_1_0_1; + openssl_1_0_1 = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; cryptodevHeaders = linuxPackages.cryptodev.override { fetchurl = fetchurlBoot; From 7d71dda6dee4570064b3f5f8d226280b2755adf5 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 13 Dec 2015 11:59:23 +0000 Subject: [PATCH 337/498] fzf: 1.11.0 -> 1.11.1 --- pkgs/top-level/go-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index d20f4ae7549..17da59b353e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -686,10 +686,10 @@ let }; fzf = buildFromGitHub { - rev = "0.11.0"; + rev = "0.11.1"; owner = "junegunn"; repo = "fzf"; - sha256 = "1jcvfdglmrsh7z6lasj2i7l3cwqd0ijhv5ywafmr7m1rn90nj1pf"; + sha256 = "1zw1kq4d5sb1qia44q04i33yii9qwlwlwz8vxhln03d4631mhsra"; buildInputs = [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text From a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Dec 2015 01:36:52 +0300 Subject: [PATCH 338/498] cdrtools: 3.00 -> 3.02a03 --- .../misc/cdrtools/cdrtools-2.01-install.patch | 13 -------- pkgs/applications/misc/cdrtools/default.nix | 23 ++++++++----- .../misc/cdrtools/fix-paths.patch | 32 +++++++++++++++++++ 3 files changed, 47 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch create mode 100644 pkgs/applications/misc/cdrtools/fix-paths.patch diff --git a/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch b/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch deleted file mode 100644 index a8d93d36998..00000000000 --- a/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN cdrtools-2.01/DEFAULTS/Defaults.linux cdrtools-2.01.new/DEFAULTS/Defaults.linux ---- cdrtools-2.01/DEFAULTS/Defaults.linux 2003-02-16 01:01:48.000000000 +0100 -+++ cdrtools-2.01.new/DEFAULTS/Defaults.linux 2005-08-30 21:13:55.000000000 +0200 -@@ -27,7 +27,8 @@ - # Installation config stuff - # - ########################################################################### --INS_BASE= /opt/schily -+#INS_BASE= /opt/schily -+INS_BASE= $(out) - INS_KBASE= / - # - DEFUMASK= 002 diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 14ab69ebd2f..b83857b6045 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, acl, libcap }: stdenv.mkDerivation rec { - name = "cdrtools-3.00"; - - configurePhase = "true"; + name = "cdrtools-3.02a03"; src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; - sha256 = "0ga2fdwn3898jas5mabb6cc2al9acqb2yyzph2w76m85414bd73z"; + sha256 = "02gjxib0sgzsdicnb7496x0a175w1sb34v8zc9mdi8cfw7skw996"; }; - patches = [ ./cdrtools-2.01-install.patch ]; + patches = [ ./fix-paths.patch ]; - meta = { + buildInputs = [ acl libcap ]; + + configurePhase = "true"; + + GMAKE_NOWARN = true; + + makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; # Licensing issues: This package contains code licensed under CDDL, GPL2 # and LGPL2. There is debate regarding the legality of this licensing. # Marked as unfree to avoid any possible legal issues. - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/cdrtools/fix-paths.patch b/pkgs/applications/misc/cdrtools/fix-paths.patch new file mode 100644 index 00000000000..f4a54121088 --- /dev/null +++ b/pkgs/applications/misc/cdrtools/fix-paths.patch @@ -0,0 +1,32 @@ +diff -ru3 cdrtools-3.01-old/DEFAULTS/Defaults.linux cdrtools-3.01/DEFAULTS/Defaults.linux +--- cdrtools-3.01-old/DEFAULTS/Defaults.linux 2015-12-11 17:37:21.505848835 +0300 ++++ cdrtools-3.01/DEFAULTS/Defaults.linux 2015-12-11 17:37:32.155828925 +0300 +@@ -57,7 +57,8 @@ + # Installation config stuff + # + ########################################################################### +-INS_BASE= /opt/schily ++#INS_BASE= /opt/schily ++INS_BASE= $(out) + INS_KBASE= / + INS_RBASE= / + # +Only in cdrtools-3.01/DEFAULTS: Defaults.linux.orig +diff -ru3 cdrtools-3.01-old/RULES/rules.prg cdrtools-3.01/RULES/rules.prg +--- cdrtools-3.01-old/RULES/rules.prg 2015-12-11 17:37:21.500848844 +0300 ++++ cdrtools-3.01/RULES/rules.prg 2015-12-11 17:38:29.890720987 +0300 +@@ -43,10 +43,10 @@ + # + #SHELL= /bin/sh + +-LN= /bin/ln +-SYMLINK= /bin/ln -s +-RM= /bin/rm +-MV= /bin/mv ++LN= ln ++SYMLINK= ln -s ++RM= rm ++MV= mv + LORDER= lorder + TSORT= tsort + CTAGS= vctags From 28f8ec1df6aaa8dfdfe736da5fce35bcce92ee79 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Dec 2015 02:53:47 +0300 Subject: [PATCH 339/498] brasero: cleanup --- pkgs/tools/cd-dvd/brasero/default.nix | 33 +++++++++------------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d7773b0ba0c..3185242f5ce 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,15 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, gnome3, makeWrapper, dvdauthor, cdrdao -, dvdplusrwtools, cdrtools, libdvdcss }: +, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao +, dvdplusrwtools, cdrtools, libdvdcss, wrapGAppsHook }: let major = "3.12"; minor = "0"; - GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav ]; + binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ]; in stdenv.mkDerivation rec { version = "${major}.${minor}"; @@ -20,13 +16,12 @@ in stdenv.mkDerivation rec { sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard dvdauthor - cdrdao dvdplusrwtools cdrtools ]; + nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ pkgconfig gtk3 itstool libxml2 libnotify libcanberra_gtk3 - intltool gnome3.gsettings_desktop_schemas makeWrapper libdvdcss - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.dconf - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libdvdcss + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; # brasero checks that the applications it uses aren't symlinks, but this # will obviously not work on nix @@ -36,16 +31,10 @@ in stdenv.mkDerivation rec { "--with-girdir=$out/share/gir-1.0" "--with-typelibdir=$out/lib/girepository-1.0" ]; + NIX_CFLAGS_LINK = [ "-ldvdcss" ]; + preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix LD_LIBRARY_PATH : ${libdvdcss}/lib - done - rm $out/share/icons/hicolor/icon-theme.cache + gappsWrapperArgs+=(--prefix PATH : "${binpath}") ''; meta = with stdenv.lib; { From 94a07ab3aebd2677a84b6f1ebfb25b4d5fc2199a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Dec 2015 20:29:18 +0300 Subject: [PATCH 340/498] fmod42416: fix upstream url, use provided Makefile --- pkgs/development/libraries/fmod/4.24.16.nix | 29 ++++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix index d1768d656b4..b78b1a46e25 100644 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ b/pkgs/development/libraries/fmod/4.24.16.nix @@ -11,12 +11,12 @@ let src = (if (bits == "64") then fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; } else fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; } ); @@ -28,23 +28,26 @@ stdenv.mkDerivation rec { version = "4.24.16"; dontStrip = true; + dontPatchELF = true; + + makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; + buildPhase = "true"; - installPhase = '' - mkdir -p $out/lib $out/include/fmodex - cd api/inc && cp * $out/include/fmodex && cd ../lib - cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so - cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so - - ${patchLib "$out/lib/libfmodex.so"} - ${patchLib "$out/lib/libfmodexL.so"} + preInstall = '' + mkdir -p $out/lib ''; - meta = { + postInstall = '' + mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so + mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so + ''; + + meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.lassulus ]; }; } From 2678e0ce022f3ee357c2d4b9f08303b6e210b39b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Dec 2015 20:29:39 +0300 Subject: [PATCH 341/498] zandronum: unify packages, fix building, cleanup --- pkgs/games/zandronum/bin.nix | 39 ++++++++------------- pkgs/games/zandronum/default.nix | 60 +++++++++++++++++++++----------- pkgs/games/zandronum/server.nix | 44 ----------------------- pkgs/top-level/all-packages.nix | 11 ++++-- 4 files changed, 63 insertions(+), 91 deletions(-) delete mode 100644 pkgs/games/zandronum/server.nix diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix index 453f7dc1c1d..cf46877ef71 100644 --- a/pkgs/games/zandronum/bin.nix +++ b/pkgs/games/zandronum/bin.nix @@ -18,10 +18,9 @@ , zlib }: -assert stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { name = "zandronum-2.1.2"; + src = fetchurl { url = "http://zandronum.com/downloads/zandronum2.1.2-linux-x86_64.tar.bz2"; sha256 = "1f5aw2m8c0bl3lrvi2k3rrzq3q9x1ikxnxxjgh3k9qvanfn7ykbk"; @@ -49,38 +48,30 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' - tar xf $src - ''; + sourceRoot = "."; installPhase = '' mkdir -p $out/bin - mkdir -p $out/share - cp * $out/share + mkdir -p $out/share/zandronum + cp *.so *.pk3 zandronum zandronum-server $out/share/zandronum - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum-server + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath $libPath:$out/share/zandronum \ + $out/share/zandronum/zandronum + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath $libPath \ + $out/share/zandronum/zandronum-server - cat > $out/bin/zandronum << EOF - #!/bin/sh - - LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum "\$@" - EOF - - cat > $out/bin/zandronum-server << EOF - #!/bin/sh - - LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum-server "\$@" - EOF - - chmod +x "$out/bin/zandronum" - chmod +x "$out/bin/zandronum-server" + ln -s $out/share/zandronum/zandronum $out/bin/zandronum + ln -s $out/share/zandronum/zandronum-server $out/bin/zandronum-server ''; meta = { homepage = http://zandronum.com/; description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play."; maintainer = [ stdenv.lib.maintainers.lassulus ]; + platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index b92551a78bf..ecdf8cfdbd2 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,43 +1,61 @@ -{ stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }: +{ stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper +, SDL, mesa, bzip2, zlib, fmod, libjpeg, fluidsynth, openssl, sqlite-amalgamation +, serverOnly ? false +}: + +let suffix = lib.optionalString serverOnly "-server"; + +# FIXME: drop binary package when upstream fixes their protocol versioning +in stdenv.mkDerivation { + name = "zandronum${suffix}-2.1.2"; -stdenv.mkDerivation { - name = "zandronum-2.1.2"; src = fetchhg { url = "https://bitbucket.org/Torr_Samaho/zandronum-stable"; rev = "a3663b0061d5"; sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56"; }; - phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; + # I have no idea why would SDL and libjpeg be needed for the server part! + # But they are. + buildInputs = [ openssl bzip2 zlib SDL libjpeg ] + ++ lib.optionals (!serverOnly) [ mesa fmod fluidsynth ]; - buildInputs = [ cmake SDL mesa fmod42416 openssl sqlite sqlite-amalgamation ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; preConfigure = '' - cp ${sqlite-amalgamation}/* sqlite/ + ln -s ${sqlite-amalgamation}/* sqlite/ ''; - cmakeFlags = [ - "-DFMOD_LIBRARY=${fmod42416}/lib/libfmodex.so" - ]; + cmakeFlags = + lib.optional (!serverOnly) "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" + ++ lib.optional serverOnly "-DSERVERONLY=ON" + ; + + enableParallelBuilding = true; installPhase = '' mkdir -p $out/bin - mkdir -p $out/share - cp zandronum zandronum.pk3 skulltag_actors.pk3 liboutput_sdl.so $out/share + mkdir -p $out/share/zandronum + cp zandronum${suffix} \ + zandronum.pk3 \ + skulltag_actors.pk3 \ + ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ + $out/share/zandronum - cat > $out/bin/zandronum << EOF - #!/bin/sh - - LD_LIBRARY_PATH=$out/share $out/share/zandronum "\$@" - EOF - - chmod +x "$out/bin/zandronum" + # For some reason, while symlinks work for binary version, they don't for source one. + makeWrapper $out/share/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} ''; - meta = { + postFixup = lib.optionalString (!serverOnly) '' + patchelf --set-rpath $(patchelf --print-rpath $out/share/zandronum/zandronum):$out/share/zandronum \ + $out/share/zandronum/zandronum + ''; + + meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software."; - maintainer = [ stdenv.lib.maintainers.lassulus ]; + maintainer = with maintainers; [ lassulus ]; + platforms = platforms.linux; + license = licenses.bsdOriginal; }; } - diff --git a/pkgs/games/zandronum/server.nix b/pkgs/games/zandronum/server.nix deleted file mode 100644 index eec2c3acc9c..00000000000 --- a/pkgs/games/zandronum/server.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }: - -stdenv.mkDerivation { - name = "zandronum-server-2.1.2"; - src = fetchhg { - url = "https://bitbucket.org/Torr_Samaho/zandronum-stable"; - rev = "a3663b0061d5"; - sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56"; - }; - - phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; - - buildInputs = [ cmake openssl sqlite sqlite-amalgamation SDL ]; - - preConfigure = '' - cp ${sqlite-amalgamation}/* sqlite/ - ''; - - cmakeFlags = [ - "-DSERVERONLY=ON" - ]; - - installPhase = '' - find - mkdir -p $out/bin - mkdir -p $out/share - cp zandronum-server zandronum.pk3 skulltag_actors.pk3 $out/share - - cat > $out/bin/zandronum-server << EOF - #!/bin/sh - - LD_LIBRARY_PATH=$out/share $out/share/zandronum-server "\$@" - EOF - - chmod +x "$out/bin/zandronum-server" - ''; - - meta = { - homepage = http://zandronum.com/; - description = "Server of the multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainer = [ stdenv.lib.maintainers.lassulus ]; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c728843286b..a62db7cd727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14421,8 +14421,15 @@ let xsokoban = callPackage ../games/xsokoban { }; - zandronum = callPackage ../games/zandronum { }; - zandronum-server = callPackage ../games/zandronum/server.nix { }; + zandronum = callPackage ../games/zandronum { + fmod = fmod42416; + cmake = cmake-2_8; + }; + + zandronum-server = zandronum.override { + serverOnly = true; + }; + zandronum-bin = callPackage ../games/zandronum/bin.nix { }; zangband = builderDefsPackage (callPackage ../games/zangband) {}; From 427d00ee366d75faec99e644c52013aa82a8726b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 13 Dec 2015 13:46:09 +0300 Subject: [PATCH 342/498] doomseeker: cleanup --- pkgs/applications/misc/doomseeker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 8ceb7f41c4e..3e76f6c36e7 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { name = "doomseeker-1.0"; + src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; }; - cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release - ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - buildInputs = [ cmake pkgconfig qt4 zlib bzip2 ]; + buildInputs = [ qt4 zlib bzip2 ]; + + nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; @@ -27,4 +28,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } - From 26e738206c6d172e35493f8e4e166775bc15e44e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 13 Dec 2015 16:25:35 +0300 Subject: [PATCH 343/498] flashplayer: cleanup, use archive as a source Most work done by ericsagnes --- .../mozilla-plugins/flashplayer-11/builder.sh | 23 ------- .../flashplayer-11/default.nix | 63 +++++++++---------- 2 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh deleted file mode 100644 index b0f8a2638c1..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 -sourceRoot=$TMPDIR - -unpackPhase() { - tar xvzf $src; - for a in *; do - if [ -d $a ]; then - cd $a - break - fi - done -} - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 7148764b223..34a06967ed8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -20,6 +20,7 @@ , atk , gdk_pixbuf , nss +, unzip , debug ? false /* you have to add ~/mm.cfg : @@ -35,45 +36,41 @@ }: let - # -> http://get.adobe.com/flashplayer/ + arch = + if stdenv.system == "x86_64-linux" then + if debug then throw "no x86_64 debugging version available" + else "64bit" + else if stdenv.system == "i686-linux" then + if debug then "32bit_debug" + else "32bit" + else throw "Flash Player is not supported on this platform"; +in +stdenv.mkDerivation rec { + name = "flashplayer-${version}"; version = "11.2.202.554"; - src = - if stdenv.system == "x86_64-linux" then - if debug then - # no plans to provide a x86_64 version: - # http://labs.adobe.com/technologies/flashplayer10/faq.html - throw "no x86_64 debugging version available" - else rec { - inherit version; - url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "15zziclffvsa0wpygkwzbh3v367n73pmzwsnkanhg75rv28dgl3x"; - } - else if stdenv.system == "i686-linux" then - if debug then - throw "flash debugging version is outdated and probably broken" /* { - # The debug version also contains a player - version = "11.1"; - url = http://fpdownload.adobe.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; - sha256 = "0jn7klq2cyqasj6nxfka2l8nsf7sn7hi6443nv6dd2sb3g7m6x92"; - }*/ - else rec { - inherit version; - url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1a26l6lz5l6qbx4lm7266pzk0zr77h6issbnayr6df9qj99bppyz"; - } - else throw "Flash Player is not supported on this platform"; + src = fetchurl { + url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; + sha256 = "0pjan07k419pk3lmfdl5vww0ipf5b76cxqhxwjrikb1fc4x993fi"; + }; -in + buildInputs = [ unzip ]; -stdenv.mkDerivation { - name = "flashplayer-${src.version}"; + postUnpack = '' + cd */*${arch} + tar -xvzf flash-plugin*.tar.gz + ''; - builder = ./builder.sh; + sourceRoot = "."; - src = fetchurl { inherit (src) url sha256; }; + dontStrip = true; + dontPatchELF = true; - inherit zlib alsaLib; + installPhase = '' + mkdir -p $out/lib/mozilla/plugins + cp -pv libflashplayer.so $out/lib/mozilla/plugins + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so + ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; @@ -85,8 +82,6 @@ stdenv.mkDerivation { libvdpau nss ]; - buildPhase = ":"; - meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; From 52505823969c9f7462fbb7efd5f36e32ca92b581 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 13 Dec 2015 16:53:59 +0300 Subject: [PATCH 344/498] nixos/acme: fix timer unit --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 8f3a2ee073b..2de57dd68cb 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -188,7 +188,7 @@ in wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = cfg.renewInterval; - Unit = "acme-simp_le-${cert}.service"; + Unit = "acme-${cert}.service"; }; }) ); From 5482aa908405dc91867fa6e49eb2eda5c158de52 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 13 Dec 2015 14:43:26 +0000 Subject: [PATCH 345/498] sabnzbd: 0.7.17 -> 0.7.20 --- pkgs/servers/sabnzbd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 09c0de9c74f..952d3b1196f 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: stdenv.mkDerivation rec { - name = "sabnzbd-0.7.17"; + version = "0.7.20"; + name = "sabnzbd-${version}"; src = fetchurl { - url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz; - sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5"; + url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz"; + sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0"; }; buildInputs = [makeWrapper python sqlite3 cheetahTemplate]; From b4766c3d43e9192e9e4c4b08a7fbf3483592bf6a Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 13 Dec 2015 14:45:14 +0000 Subject: [PATCH 346/498] sabnzbd: Fix OpenSSL wrapping. - Add SSL support by adding pyopenssl to PYTHONPATH - Update build script to use wrapPythonProgramsIn - Update the meta info --- pkgs/servers/sabnzbd/builder.sh | 7 ++----- pkgs/servers/sabnzbd/default.nix | 17 ++++++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh index 3a5c8adb421..c446891d8dc 100644 --- a/pkgs/servers/sabnzbd/builder.sh +++ b/pkgs/servers/sabnzbd/builder.sh @@ -3,14 +3,11 @@ source $stdenv/setup tar xvfz $src mv SABnzbd-* $out -# Create a start script and let wrapProgram with toPythonPath wrap it so that python is started with cheetahTemplate in its importpath (classpath) mkdir $out/bin echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd chmod +x $out/bin/sabnzbd -for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \ - --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" -done +wrapPythonProgramsIn $out/bin "$pythonPath" +wrapProgram $out/bin/.sabnzbd-wrapped --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" echo $out diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 952d3b1196f..ee2176ae49a 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,21 +1,24 @@ -{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}: +{stdenv, fetchurl, python, pythonPackages, par2cmdline, unzip, unrar}: stdenv.mkDerivation rec { version = "0.7.20"; name = "sabnzbd-${version}"; - + src = fetchurl { url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz"; sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0"; }; - buildInputs = [makeWrapper python sqlite3 cheetahTemplate]; - inherit stdenv python cheetahTemplate par2cmdline unzip unrar; - inherit (pythonPackages) sqlite3; + pythonPath = with pythonPackages; [ pyopenssl sqlite3 cheetah ]; + buildInputs = with pythonPackages; [wrapPython]; + inherit python par2cmdline unzip unrar; builder = ./builder.sh; - - meta = { + + meta = with stdenv.lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; + homepage = http://sabnzbd.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } From e7757c47b73fe84ff63ec84ee90b6bb7dcd2ef05 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 15:55:12 +0100 Subject: [PATCH 347/498] betamax: init at 0.5.1 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4c1920acc9..0c38cc760d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1287,6 +1287,24 @@ in modules // { }; }; + betamax = buildPythonPackage rec { + name = "betamax-0.5.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/betamax/${name}.tar.gz"; + sha256 = "1glzigrbip9w2jr2gcmwa96rffhi9x9l1455dhbcx2gh3pmcykl6"; + }; + + propagatedBuildInputs = [ self.requests2 ]; + + meta = with stdenv.lib; { + homepage = https://betamax.readthedocs.org/en/latest/; + description = "A VCR imitation for requests"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; + }; + caldavclientlibrary-asynk = buildPythonPackage rec { version = "asynkdev"; name = "caldavclientlibrary-asynk-${version}"; From 8443067e44cac135ff59abde4bdc2b4445f73c61 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 16:07:48 +0100 Subject: [PATCH 348/498] betamax-matchers: init at 0.2.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c38cc760d9..de3d3dbea3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1305,6 +1305,25 @@ in modules // { }; }; + betamax-matchers = buildPythonPackage rec { + name = "betamax-matchers-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/betamax-matchers/${name}.tar.gz"; + sha256 = "13n2dy8s2jx8x8bbx684bff3444584bnmg0zhkfxhxndpy18p4is"; + }; + + buildInputs = with self; [ betamax requests_toolbelt ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sigmavirus24/betamax_matchers; + description = "A group of experimental matchers for Betamax"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; + }; + caldavclientlibrary-asynk = buildPythonPackage rec { version = "asynkdev"; name = "caldavclientlibrary-asynk-${version}"; From 36e1e3a8a692e414e02cc08322476f921429dc23 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 12 Dec 2015 12:06:14 +0000 Subject: [PATCH 349/498] clamav: Fixed indentation. --- nixos/modules/services/security/clamav.nix | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index a4d54301fc1..583fadb9d10 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -13,27 +13,27 @@ in services.clamav = { updater = { - enable = mkOption { - default = false; - description = '' - Whether to enable automatic ClamAV virus definitions database updates. - ''; - }; + enable = mkOption { + default = false; + description = '' + Whether to enable automatic ClamAV virus definitions database updates. + ''; + }; - frequency = mkOption { - default = 12; - description = '' - Number of database checks per day. - ''; - }; + frequency = mkOption { + default = 12; + description = '' + Number of database checks per day. + ''; + }; - config = mkOption { - default = ""; - description = '' - Extra configuration for freshclam. Contents will be added verbatim to the - configuration file. - ''; - }; + config = mkOption { + default = ""; + description = '' + Extra configuration for freshclam. Contents will be added verbatim to the + configuration file. + ''; + }; }; }; }; @@ -63,15 +63,15 @@ in jobs = { clamav_updater = { - name = "clamav-updater"; - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; + name = "clamav-updater"; + startOn = "started network-interfaces"; + stopOn = "stopping network-interfaces"; - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${clamavUser}:${clamavGroup} ${stateDir} + preStart = '' + mkdir -m 0755 -p ${stateDir} + chown ${clamavUser}:${clamavGroup} ${stateDir} ''; - exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; + exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; }; }; From 3eab158fb8007d03e9ed295068140bbe25306bef Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 16:27:04 +0100 Subject: [PATCH 350/498] github3.py: init at 1.0.0a2 --- pkgs/top-level/python-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de3d3dbea3a..3ce3eadfe1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8225,6 +8225,36 @@ in modules // { }; }; + github3_py = buildPythonPackage rec { + name = "github3.py-${version}"; + version = "1.0.0a2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/github3.py/${name}.tar.gz"; + sha256 = "11xvwbzfy04vwbjnpc8wcrjjzghbrbdzffrdfk70v0zdnxqg8hc5"; + }; + + buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers ]; + + propagatedBuildInputs = with self; [ requests2 pyopenssl uritemplate_py + ndg-httpsclient requests_toolbelt pyasn1 ]; + + postPatch = '' + sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py + sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py + ''; + + # TODO: only disable the tests that require network + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github3py.readthedocs.org/en/master/; + description = "A wrapper for the GitHub API written in python"; + license = licenses.bsd3; + maintainers = with maintainers; [ pSub ]; + }; + }; + goobook = buildPythonPackage rec { name = "goobook-1.9"; disabled = isPy3k; From 0f1de2ea9fd7f92e745a1ace6f24e73ae750d14f Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sun, 13 Dec 2015 16:43:31 +0100 Subject: [PATCH 351/498] miniupnpd: firewall config --- .../modules/services/networking/miniupnpd.nix | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix index e654eb80b17..19400edb68f 100644 --- a/nixos/modules/services/networking/miniupnpd.nix +++ b/nixos/modules/services/networking/miniupnpd.nix @@ -30,7 +30,7 @@ in internalIPs = mkOption { type = types.listOf types.str; - example = [ "192.168.1.0/24" ]; + example = [ "192.168.1.1/24" "enp1s0" ]; description = '' The IP address ranges to listen on. ''; @@ -57,13 +57,42 @@ in }; config = mkIf cfg.enable { + # from miniupnpd/netfilter/iptables_init.sh + networking.firewall.extraCommands = '' + iptables -t nat -N MINIUPNPD + iptables -t nat -A PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD + iptables -t mangle -N MINIUPNPD + iptables -t mangle -A PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD + iptables -t filter -N MINIUPNPD + iptables -t filter -A FORWARD -i ${cfg.externalInterface} ! -o ${cfg.externalInterface} -j MINIUPNPD + iptables -t nat -N MINIUPNPD-PCP-PEER + iptables -t nat -A POSTROUTING -o ${cfg.externalInterface} -j MINIUPNPD-PCP-PEER + ''; + + # from miniupnpd/netfilter/iptables_removeall.sh + networking.firewall.extraStopCommands = '' + iptables -t nat -F MINIUPNPD + iptables -t nat -D PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD + iptables -t nat -X MINIUPNPD + iptables -t mangle -F MINIUPNPD + iptables -t mangle -D PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD + iptables -t mangle -X MINIUPNPD + iptables -t filter -F MINIUPNPD + iptables -t filter -D FORWARD -i ${cfg.externalInterface} ! -o ${cfg.externalInterface} -j MINIUPNPD + iptables -t filter -X MINIUPNPD + iptables -t nat -F MINIUPNPD-PCP-PEER + iptables -t nat -D POSTROUTING -o ${cfg.externalInterface} -j MINIUPNPD-PCP-PEER + iptables -t nat -X MINIUPNPD-PCP-PEER + ''; + systemd.services.miniupnpd = { description = "MiniUPnP daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.miniupnpd ]; serviceConfig = { - ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -d -f ${configFile}"; + ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -f ${configFile}"; + PIDFile = "/var/run/miniupnpd.pid"; + Type = "forking"; }; }; }; From b5b9b0351880b051f68f04be9857c6d7f935309c Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 12 Dec 2015 12:45:48 +0000 Subject: [PATCH 352/498] clamav: improvements - Add new service for `clamd`, the ClamAV daemon. - Replace the old upstart "jobs" section with systemd.services - Remove unnecessary config options. - Use `mkEnableOption` --- nixos/modules/services/security/clamav.nix | 107 ++++++++++++++------- 1 file changed, 72 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 583fadb9d10..548aee29b26 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -3,22 +3,37 @@ with lib; let clamavUser = "clamav"; stateDir = "/var/lib/clamav"; + runDir = "/var/run/clamav"; + logDir = "/var/log/clamav"; clamavGroup = clamavUser; cfg = config.services.clamav; + clamdConfigFile = pkgs.writeText "clamd.conf" '' + DatabaseDirectory ${stateDir} + LocalSocket ${runDir}/clamd.ctl + LogFile ${logDir}/clamav.log + PidFile ${runDir}/clamd.pid + User clamav + + ${cfg.daemon.extraConfig} + ''; in { - ###### interface - options = { - services.clamav = { - updater = { - enable = mkOption { - default = false; - description = '' - Whether to enable automatic ClamAV virus definitions database updates. + daemon = { + enable = mkEnableOption "clamd daemon"; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration for clamd. Contents will be added verbatim to the + configuration file. ''; }; + }; + updater = { + enable = mkEnableOption "freshclam updater"; frequency = mkOption { default = 12; @@ -38,43 +53,65 @@ in }; }; - ###### implementation - - config = mkIf cfg.updater.enable { + config = mkIf cfg.updater.enable or cfg.daemon.enable { environment.systemPackages = [ pkgs.clamav ]; - users.extraUsers = singleton - { name = clamavUser; - uid = config.ids.uids.clamav; - description = "ClamAV daemon user"; - home = stateDir; - }; + users.extraUsers = singleton { + name = clamavUser; + uid = config.ids.uids.clamav; + description = "ClamAV daemon user"; + home = stateDir; + }; - users.extraGroups = singleton - { name = clamavGroup; - gid = config.ids.gids.clamav; - }; + users.extraGroups = singleton { + name = clamavGroup; + gid = config.ids.gids.clamav; + }; - services.clamav.updater.config = '' + services.clamav.updater.config = mkIf cfg.updater.enable '' DatabaseDirectory ${stateDir} Foreground yes Checks ${toString cfg.updater.frequency} DatabaseMirror database.clamav.net ''; - jobs = { - clamav_updater = { - name = "clamav-updater"; - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; - - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${clamavUser}:${clamavGroup} ${stateDir} - ''; - exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; - }; + systemd.services.clamd = mkIf cfg.daemon.enable { + description = "ClamAV daemon (clamd)"; + path = [ pkgs.clamav ]; + after = [ "network.target" "freshclam.service" ]; + requires = [ "freshclam.service" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -m 0755 -p ${logDir} + mkdir -m 0755 -p ${runDir} + chown ${clamavUser}:${clamavGroup} ${logDir} + chown ${clamavUser}:${clamavGroup} ${runDir} + ''; + serviceConfig = { + ExecStart = "${pkgs.clamav}/bin/clamd --config-file=${clamdConfigFile}"; + Type = "forking"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; + }; }; + systemd.services.freshclam = mkIf cfg.updater.enable { + description = "ClamAV updater (freshclam)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.clamav ]; + preStart = '' + mkdir -m 0755 -p ${stateDir} + chown ${clamavUser}:${clamavGroup} ${stateDir} + ''; + serviceConfig = { + ExecStart = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; + }; + }; }; - } From 03cf5e662746ce00a09c8b050b433357728b14be Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 13 Dec 2015 17:00:13 +0100 Subject: [PATCH 353/498] chromium: Updates. - dev: 48.0.2564.22 -> 49.0.2587.3 - beta: 48.0.2564.23 -> 48.0.2564.41 - stable: 47.0.2526.73 -> 47.0.2526.80 --- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 55facf55438..04ab0c95b16 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "48.0.2564.22"; - sha256 = "18kk8vmv7c8dsxdghvrjl90davm0gc4wdvs5zmsgiymlw1c6qpaj"; - sha256bin32 = "1b10bb83npnn24fxl7jqkrhjzhk211cgf1f2ykx50z3cc41v4rvp"; - sha256bin64 = "0a3w22blkpnk1wdg201ixm8jm7lrn4md64wcllmm69z433flrg1b"; + version = "49.0.2587.3"; + sha256 = "05mhd6z833w1r4v7jz8rbm06j29h0l4ix45v29l5npv41sqr4lj2"; + sha256bin32 = "1lrf3zfzy3yif854nkrl6acdfwc93xhry9ykfjjr1a4mpnlqbp1v"; + sha256bin64 = "1sn1p5jh2gy463np99xw7jhcl9hd28b4gm2wqv19z0a67k84jdpd"; }; beta = { - version = "48.0.2564.23"; - sha256 = "0rhjrvxsxv84jahnph26lbivfa6g48qmv1mw6wysjx8rvfpfx9g9"; - sha256bin32 = "17330cv6zv25z5y6pbfc9hb7vk77yggvcdggknkvvbfd0p6mrf4z"; - sha256bin64 = "0d3r64ipgigjqgnr57lklk5icv2snd2gq9w6aw7apfx61qlbnxly"; + version = "48.0.2564.41"; + sha256 = "06k5vjv1argvxssjrlvyxn5gi93gx8r8dqanv3cpvwpw8nwyqrdj"; + sha256bin32 = "0k77hpacnz0plh67wd2p6dxbpkcb8930p08inxy3mzjlralq9fyj"; + sha256bin64 = "1zdisb36s5nh7h7swfyjb2shxpapp1anpil4prfd3jkf6bv64k1i"; }; stable = { - version = "47.0.2526.73"; - sha256 = "1xgl2pmvfxnm2pk4p4p4v642ip0cxxjysc1xy4pmdxnzilfd0rkd"; - sha256bin32 = "1y9g14s81xanp70l0s6grszn4q0acn4rgm46i5kigf37s1cbwagy"; - sha256bin64 = "1y00znk5cfd1nvh4dx92b0m8q38849i25a18zg2lhvjqrpq097za"; + version = "47.0.2526.80"; + sha256 = "01adc5fh2agk2d5a15pg230x3h43h4lxmzlvwbm43dm34f1i81xi"; + sha256bin32 = "0779z35snwc3qnh5fzf9gm4mmw8vj0j8k3w3vlksn532hclyl6b6"; + sha256bin64 = "0xj9i06xdsarfl1jfw6ra3j1ri0iqnjafqw2p2r4kaqsgf1a2fdv"; }; } From 65d8af5af257ba635113740bf0a1820df9827ab4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 13 Dec 2015 16:34:31 +0100 Subject: [PATCH 354/498] claws-mail: Fix fancy plugin, fixes #10421 This fixes the fancy plugin displaying HTML mails as text as suggested by @wedens. --- .../networking/mailreaders/claws-mail/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index beb21546c0c..8f2c5cf8c46 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -95,6 +95,10 @@ stdenv.mkDerivation { wrapPrefixVariables = [ "GIO_EXTRA_MODULES" ]; GIO_EXTRA_MODULES = "${glib_networking}/lib/gio/modules"; + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + ''; + postInstall = '' mkdir -p $out/share/applications cp claws-mail.desktop $out/share/applications From cabd3effdad6ffddeb4ebe661dde1262cf6d84ac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 13 Dec 2015 17:08:24 +0100 Subject: [PATCH 355/498] claws-mail: Remove extra GIO_EXTRA_MODULES wrapping --- .../networking/mailreaders/claws-mail/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 8f2c5cf8c46..831fb97ab91 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { buildInputs = [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme - libetpan perl pkgconfig python wrapGAppsHook + libetpan perl pkgconfig python wrapGAppsHook glib_networking ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] @@ -92,9 +92,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - wrapPrefixVariables = [ "GIO_EXTRA_MODULES" ]; - GIO_EXTRA_MODULES = "${glib_networking}/lib/gio/modules"; - preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") ''; From ab9bf1e4fae4fd4bda490eb7bbcf79f8593de5af Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Sun, 13 Dec 2015 13:56:15 +0000 Subject: [PATCH 356/498] {lib-}mediainfo{-gui}: 0.7.79 -> 0.7.80 From the changelog: ``` Version 0.7.80, 2015-11-30 + Matroska: support of MKVMerge statistics tags (duration frame count, stream size, bit rate) per track, thanks to ndjamena + FLAC: Channel positions, thanks to ndjamena + FLAC: difference between detected bit depth and stored bit depth + MPEG-TS: if DTVCC transport stream is present and no DTVCC service descriptor, scan also in the middle of the file in order to detect more caption services + Subtitle frame rate computing if frame count and duration are available (hidden by default) + Subtitles in Matroska: count of elements + Matroska, MXF and MP4/MOV: detection of truncated files + DTS: difference between ES Matrix and ES Discrete + DTS: display ES Matrix or ES Discrete even if HRA or MA is present + DTS: difference between DTS-HRA with 96k option and pure DTS-96/24 + DTS: detection of DTS:X + Samples per frame info + AC-3: detection of Atmos inside TrueHD + Video frame rate: showing precision of 1/1.001 frame rates (e.g. "23.976 (24000/1001) fps" and "23.976 (23976/1000) fps") + MPEG-4/MOV: showing the complete list of compatible brands in the CodecID field + MPEG-4/MOV: Alternate groups + MPEG-4/MOV: "Disabled" tag + MPEG-4/MOV: "Forced" tag + MPEG-4/MOV: showing links between tracks (chapters for, subtitles for, fallback for) + MXF: handling of more acquisition metadata items + MXF: Package name + AVC: Store method of interlaced content (Interleaved Fields or Separated Fields) + EBUCore: acquisition metadata (Proof of concept, for feedback only) x Matroska: frame rate detection algorithm revisited, less wrong numbers are expected x SDP/Teletext: some pages were sometimes (when present in 2 different SDP lines) displayed several times x MPEG-4/MOV: some hint tracks were not displayed + Hongkongese language added + Option "Full parsing" ``` --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index a7dfac1eb0d..9bed20c0c73 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.79"; + version = "0.7.80"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3"; + sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 560e0ef1433..40531ea58a1 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.79"; + version = "0.7.80"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3"; + sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index d9619fd2712..5fbc6bb1dbf 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.79"; + version = "0.7.80"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d"; + sha256 = "0v9px37qx0dkx67gqwi1rd9x4m7zm1ml8sdj5fx0isj6qymbd1z5"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; From e470d15423f7c202d33ee7cb11891542e298dfa3 Mon Sep 17 00:00:00 2001 From: goibhniu Date: Sun, 13 Dec 2015 18:16:49 +0100 Subject: [PATCH 357/498] zam-plugins: update hash (uses git submodules) --- pkgs/applications/audio/zam-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 7492e8e0a37..48f559dfd86 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; rev = "91fe56931a3e57b80f18c740d2dde6b44f962aee"; - sha256 = "17slpywjs04xbcylyqjg6kqbpqwqbigf843y437yfvj1ar6ir1jp"; + sha256 = "0n29zxg4l2m3jsnfw6q2alyzaw7ibbv9nvk57k07sv3lh2yy3f30"; }; buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ]; From 86038283244629400bebd38432ffe298b95842ef Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 13 Dec 2015 18:53:50 +0100 Subject: [PATCH 358/498] flask: add missing dependencies and fix license --- 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 3ce3eadfe1c..b2d8099858a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7534,12 +7534,12 @@ in modules // { md5 = "378670fe456957eb3c27ddaef60b2b24"; }; - propagatedBuildInputs = with self; [ werkzeug jinja2 ]; + propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; meta = { homepage = http://flask.pocoo.org/; description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = "BSD"; + license = licenses.bsd3; }; }; From 3fca941aeb2ed76f28f5815cde1af0610871ab1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 12 Dec 2015 19:01:08 +0100 Subject: [PATCH 359/498] virtualisation.qemu.options: specify type --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 15b0da3bab7..b1f36cf3264 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -297,6 +297,7 @@ in virtualisation.qemu = { options = mkOption { + type = types.listOf types.unspecified; default = []; example = [ "-vga std" ]; description = "Options passed to QEMU."; From 128e635d8a608bc33b34f4caafb27f3d6fe1c402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 13 Dec 2015 18:51:54 +0100 Subject: [PATCH 360/498] pythonPackages.monothonic: address #7307 --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2d8099858a..1b673629b36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10570,6 +10570,11 @@ in modules // { url = "http://pypi.python.org/packages/source/m/monotonic/${name}.tar.gz"; sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5"; }; + + patchPhase = optionalString stdenv.isLinux '' + substituteInPlace monotonic.py --replace \ + "ctypes.util.find_library('c')" "'${stdenv.glibc}/lib/libc.so.6'" + ''; }; MySQL_python = buildPythonPackage rec { From 020a09adbbc53301c45514c76dd8489a5175bce0 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Sun, 13 Dec 2015 22:52:35 +0300 Subject: [PATCH 361/498] fish: Use /bin/hostname on darwin. Fixes #11012. --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c4386b1a9fb..ef3794d5144 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { -i "$out/share/fish/functions/seq.fish" \ "$out/share/fish/functions/math.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" - sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ -e "s|which |${which}/bin/which |" \ @@ -31,6 +30,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ --replace "clear;" "${ncurses}/bin/clear;" '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish" sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" '' + '' sed -i "s|/sbin /usr/sbin||" \ From 000fe587692e2db8829ebd0894e7204f12a86859 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 13 Dec 2015 12:02:42 -0800 Subject: [PATCH 362/498] adv_cmds: fix typo in file name adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While that probably doesn't matter in default installations, it does matter for case-sensitive filesystems. --- .../darwin/apple-source-releases/adv_cmds/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index a0261875c10..d72afac88fe 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -19,7 +19,7 @@ in appleDerivation { buildInputs = [ bsdmake perl yacc flex ]; patchPhase = '' - substituteInPlace BSDMakefile \ + substituteInPlace BSDmakefile \ --replace chgrp true \ --replace /Developer/Makefiles/bin/compress-man-pages.pl true \ --replace "ps.tproj" "" --replace "gencat.tproj" "" --replace "md.tproj" "" \ From 9a40af11c320ec49d5d1a5542a27bc0a9dbe1dea Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 13 Dec 2015 14:31:00 -0800 Subject: [PATCH 363/498] corkscrew: fix darwin build corkscrew ships outdated versions of config.{sub,guess}. Point to automake version instead. --- pkgs/tools/networking/corkscrew/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 96747e82cee..d66a4890afe 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, automake }: stdenv.mkDerivation rec { name = "corkscrew-2.0"; @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; }; + preConfigure = '' + ln -sf ${automake}/share/automake-*/config.sub config.sub + ln -sf ${automake}/share/automake-*/config.guess config.guess + ''; + meta = with stdenv.lib; { homepage = http://agroman.net/corkscrew/; description = "A tool for tunneling SSH through HTTP proxies"; From 38161e837237cb483d1081ebf53b942d1818173f Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sat, 28 Nov 2015 00:45:36 -0800 Subject: [PATCH 364/498] zile: build on unix zile works fine on non-linux unix systems --- pkgs/applications/editors/zile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 48839246600..7282dc0ba20 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 7349f406ff3cb6c61456c58e0a20b9f8a1535eb3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 14 Dec 2015 02:05:01 +0100 Subject: [PATCH 365/498] khal: update 0.6.0->0.7.0 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index cbc728bc1f5..22610c853e3 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; name = "khal-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz"; - sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs"; + sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66"; }; propagatedBuildInputs = with pythonPackages; [ From 618414ff46c69bdd29294f2db79a890648b9fdb2 Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Sun, 13 Dec 2015 19:33:47 -0500 Subject: [PATCH 366/498] super-user-spark: 0.1.0.0 -> 0.2.0.3 --- .../misc/super_user_spark/default.nix | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index 73a9e343df9..0b89e6a6152 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -1,33 +1,31 @@ -{ mkDerivation, fetchurl, ghc, aeson, aeson-pretty, base, binary, bytestring -, directory, filepath, HTF, HUnit, mtl, parsec, process, shelly -, stdenv, text, transformers, unix, xdg-basedir -, happy +{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring +, directory, fetchgit, filepath, HTF, HUnit, mtl +, optparse-applicative, parsec, process, shelly, stdenv, text +, transformers, unix, zlib }: - -mkDerivation rec { +mkDerivation { pname = "super-user-spark"; - version = "0.1.0.0"; - - src = fetchurl { - url = "https://github.com/NorfairKing/super-user-spark/archive/v0.1.tar.gz"; - sha256 = "90258cb2d38f35b03867fdf82dbd49500cdec04f3cf05d0eaa18592cb44fe13f"; + version = "0.2.0.3"; + src = fetchgit { + url = "https://github.com/NorfairKing/super-user-spark"; + sha256 = "718b6760e76377aa37b145d0dff690b293325b510ce05d239c4fa28538420931"; + rev = "a7d132f7631649c3a093ede286e66f78e9793fba"; }; - isLibrary = false; isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + mtl optparse-applicative parsec process shelly text transformers + unix zlib + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + HUnit mtl optparse-applicative parsec process shelly text + transformers unix zlib + ]; jailbreak = true; - - buildDepends = [ - aeson aeson-pretty base binary bytestring directory filepath HTF - mtl parsec process shelly text transformers unix xdg-basedir happy - ]; - testDepends = [ - aeson aeson-pretty base binary bytestring directory filepath HTF - HUnit mtl parsec process shelly text transformers unix xdg-basedir - ]; + description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; homepage = "https://github.com/NorfairKing/super-user-spark"; - description = "A safe way to never worry about your beautifully configured system again"; - platforms = ghc.meta.platforms; maintainers = [ stdenv.lib.maintainers.badi ]; } From a8d43d6950b6f0c80436e905d4946e1371cf6e1e Mon Sep 17 00:00:00 2001 From: Badi' Abdul-Wahid Date: Sun, 13 Dec 2015 20:45:11 -0500 Subject: [PATCH 367/498] google-musicmanager: beta_1.0.221.5230-r0 -> beta_1.0.243.1116-r0 --- pkgs/applications/audio/google-musicmanager/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 7c69a25eb04..f86513659b6 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -6,23 +6,24 @@ let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.243.1116-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; # When looking for newer versions, since google doesn't let you list their repo dirs, # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release - # fetch an appropriate packages file eg main/binary-amd64/Packages + # fetch an appropriate packages file such as main/binary-amd64/Packages: + # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages # which will contain the links to all available *.debs for the arch. src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; + sha256 = "54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c"; } else fetchurl { url = archUrl name "i386"; - sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; + sha256 = "121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c"; }; unpackPhase = '' From f076a0867feb51fb87c527389c48fb90ac5fd25f Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Mon, 16 Nov 2015 15:36:10 -0600 Subject: [PATCH 368/498] geda: refdes_renum called /usr/bin/perl --- pkgs/applications/science/electronics/geda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 03ddf835343..25934c71e8e 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk }: +{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk, perl }: stdenv.mkDerivation rec { name = "geda-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk flex gawk ]; + buildInputs = [ pkgconfig guile gtk flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; From 5ff41b047a7a9a4a99c5373c5b75bf0e1d639203 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Sat, 12 Dec 2015 21:29:28 +0100 Subject: [PATCH 369/498] python.imread: init at 0.5.1 This is a package to read image files into numpy arrays. --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 596b8a49a10..c78a3e61a98 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -174,6 +174,7 @@ lsix = "Lancelot SIX "; ludo = "Ludovic Courtès "; lukego = "Luke Gorrie "; + luispedro = "Luis Pedro Coelho "; lw = "Sergey Sofeychuk "; madjar = "Georges Dubus "; magnetophon = "Bart Brouns "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f76a13d6f5..22c2fd6c1d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4940,6 +4940,33 @@ in modules // { }; }; + imread = buildPythonPackage rec { + name = "python-imread-${version}"; + version = "0.5.1"; + + src = pkgs.fetchurl { + url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz"; + sha256 = "12d7ba3523ba50d67d526e9797e041021dd9cd4acf9567a9bf73c8ae0b689d4a"; + }; + + buildInputs = with self; [ + nose + pkgs.libjpeg + pkgs.libpng + pkgs.libtiff + pkgs.libwebp + ]; + propagatedBuildInputs = with self; [ numpy ]; + + meta = with stdenv.lib; { + description = "Python package to load images as numpy arrays"; + homepage = https://readthedocs.org/projects/imread/; + maintainers = with maintainers; [ luispedro ]; + license = licenses.mit; + platforms = platforms.linux; + }; + }; + itsdangerous = buildPythonPackage rec { name = "itsdangerous-0.24"; From a77a8e3ca668c53854fbe0558f1642949040ace6 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Sat, 12 Dec 2015 23:30:16 +0100 Subject: [PATCH 370/498] python.mahotas: init at 1.4.0 This is a computer vision package for Python based on numpy --- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22c2fd6c1d3..7a64f43c14b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3097,6 +3097,34 @@ in modules // { }; }; + mahotas = buildPythonPackage rec { + name = "python-mahotas-${version}"; + version = "1.4.0"; + + src = pkgs.fetchurl { + url = "https://github.com/luispedro/mahotas/archive/release-${version}.tar.gz"; + sha256 = "30c4b979e0d5f4c013860321766a79ffcabe56c1ad9088e5d0c6b36aec5f0415"; + }; + + buildInputs = with self; [ + nose + pillow + scipy + ]; + propagatedBuildInputs = with self; [ + numpy + imread + ]; + + meta = with stdenv.lib; { + description = "Computer vision package based on numpy"; + homepage = https://readthedocs.org/projects/mahotas/; + maintainers = with maintainers; [ luispedro ]; + license = licenses.mit; + platforms = platforms.linux; + }; + }; + mixpanel = buildPythonPackage rec { version = "4.0.2"; name = "mixpanel-${version}"; From b22725847def45ff717c1e9b8ceae0ac62f7ce63 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 14 Dec 2015 20:49:14 +0900 Subject: [PATCH 371/498] udevil: added patch --- pkgs/applications/misc/udevil/default.nix | 1 + .../misc/udevil/device-info-sys-stat.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/misc/udevil/device-info-sys-stat.patch diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 5ba80348d1f..75c02d3ba6d 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { cat src/Makefile.am exit 2 ''; + patches = [ ./device-info-sys-stat.patch ]; meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = https://ignorantguru.github.io/udevil/; diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/pkgs/applications/misc/udevil/device-info-sys-stat.patch new file mode 100644 index 00000000000..554682108e3 --- /dev/null +++ b/pkgs/applications/misc/udevil/device-info-sys-stat.patch @@ -0,0 +1,14 @@ +diff --git a/src/device-info.h b/src/device-info.h +index 6cb3683..ddac24c 100644 +--- a/src/device-info.h ++++ b/src/device-info.h +@@ -18,7 +18,8 @@ + // intltool + #include + +- ++// stat ++#include + + typedef struct device_t { + struct udev_device *udevice; From b6199833547a08e550b9111b7f09fa856e144c26 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Mon, 14 Dec 2015 21:05:25 +0900 Subject: [PATCH 372/498] signing-party: 2.0 -> 2.1 --- pkgs/tools/security/signing-party/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 21e0bb4c4a9..dfd5cd6c7d7 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, gnupg, perl, automake111x, autoconf}: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; basename = "signing-party"; name = "${basename}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz"; - sha256 = "0vn15sb2yyzd57xdblw48p5hi6fnpvgy83mqyz5ygph65y5y88yc"; + sha256 = "0pcni3mf92503bqknwlsvv1f5gz23dmzwas2j8g2fk7afjd891ya"; }; sourceRoot = "."; From 686f1ff9245617bf311062fc9ef044217ff8e2c3 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:49:17 +0100 Subject: [PATCH 373/498] python-packages: MechanicalSoup: init at 0.4.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ce3eadfe1c..33cad1540c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9866,6 +9866,25 @@ in modules // { }; }); + MechanicalSoup = buildPythonPackage rec { + name = "MechanicalSoup-${version}"; + version = "0.4.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/M/MechanicalSoup/${name}.zip"; + sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; + }; + + propagatedBuildInputs = with self; [ requests2 beautifulsoup4 six ]; + + meta = { + description = "A Python library for automating interaction with websites"; + homepage = https://github.com/hickford/MechanicalSoup; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + }; + }; + meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; From 2f41c41f95ec751bbb44bf57e9828b3f7a9df9e2 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:49:58 +0100 Subject: [PATCH 374/498] python-packages: gspoauth: init at 0.0.4 --- pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33cad1540c3..bde4c28ab6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4848,6 +4848,38 @@ in modules // { }; }; + gpsoauth = buildPythonPackage rec { + version = "0.0.4"; + name = "gpsoauth-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/gpsoauth/${name}.tar.gz"; + sha256 = "1mhd2lkl1f4fmia1cwxwik8gvqr5q16scjip7kfwzadh9a11n9kw"; + }; + + propagatedBuildInputs = with self; [ + cffi + cryptography + enum34 + idna + ipaddress + ndg-httpsclient + pyopenssl + pyasn1 + pycparser + pycrypto + requests2 + six + ]; + + meta = { + description = "A python client library for Google Play Services OAuth."; + homepage = "https://github.com/simon-weber/gpsoauth"; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + }; + }; + gst-python = callPackage ../development/libraries/gstreamer/python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; From 9571740b1b49c4079824bf6fb768e2c4269855a7 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:51:57 +0100 Subject: [PATCH 375/498] python-packages: gmusicapi: 4.0.0 -> 7.0.0 --- pkgs/top-level/python-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bde4c28ab6d..1283263c0be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4667,11 +4667,11 @@ in modules // { }; gmusicapi = with pkgs; buildPythonPackage rec { - name = "gmusicapi-4.0.0"; + name = "gmusicapi-7.0.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-4.0.0.tar.gz"; - md5 = "12ba66607531978b349c7035c9bab311"; + url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-7.0.0.tar.gz"; + sha256 = "1zji4cgylyzz97cz69lywkbsn5nvvzrhk7iaqnpqpfvj9gwdchwn"; }; propagatedBuildInputs = with self; [ @@ -4680,14 +4680,16 @@ in modules // { mutagen protobuf setuptools - requests + requests2 dateutil proboscis mock appdirs oauth2client + pyopenssl + gpsoauth + MechanicalSoup ]; - doCheck = false; meta = { description = "An unofficial API for Google Play Music"; From 872d0be1a0441d3e1071bc00feb109654a00f211 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:53:01 +0100 Subject: [PATCH 376/498] mopidy-gmusic: init at 1.0.0 --- lib/maintainers.nix | 1 + .../audio/mopidy-gmusic/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-gmusic/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d1e2b100ab8..8b3694f9a3d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; + jgillich = "Jakob Gillich "; jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix new file mode 100644 index 00000000000..00468db767a --- /dev/null +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-gmusic-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; + sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://www.mopidy.com/; + description = "Mopidy extension for playing music from Google Play Music"; + license = licenses.asl20; + maintainers = [ maintainers.jgillich ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142ea8d114c..e9f6847d34f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12489,6 +12489,8 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; From d241354dcdaee5329f78e1039ebcdd7ef05dc379 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 14:28:56 +0100 Subject: [PATCH 377/498] mopidy: 1.0.5 -> 1.1.1 --- pkgs/applications/audio/mopidy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7c236944892..39889973430 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0lhmm2w2djf6mb3acw1yq1k4j74v1lf4kgx24dsdnpkgsycrv5q6"; + sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good ]; # There are no tests From 2f26b82411ea93349d375ea3b5d833b04a455972 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 14 Dec 2015 11:14:53 -0500 Subject: [PATCH 378/498] Remove PATH assumption from fhs-userenv. Previously is was assumed that bash was in the path when calling the environment setup script. This changes all of the references of bash to be absolute paths so that the user doesn't have to worry about the environment they call it with. --- pkgs/build-support/build-fhs-userenv/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index aa95080ac52..54ce3e76897 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,8 +1,9 @@ -{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : -{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "" } : +{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } : +{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "" } : let name = env.pname; + bash' = "${bash}/bin/bash"; # Sandboxing script chroot-user = writeScriptBin "chroot-user" '' @@ -29,7 +30,7 @@ in runCommand name { runCommand "${name}-shell-env" { shellHook = '' export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS" - exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)" + exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init bash'} "$(pwd)" ''; } '' echo >&2 "" @@ -42,7 +43,7 @@ in runCommand name { cat <$out/bin/${name} #! ${stdenv.shell} export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS" - exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@" + exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} From a5bc11f9eb70482daf559019f9b775c285defb63 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Dec 2015 17:26:24 +0100 Subject: [PATCH 379/498] nixos/vm-tests: Remove msize mount option This seems to be the root cause of the random page allocation failures and @wizeman did a very good job on not only finding the root problem but also giving a detailed explanation of it in #10828. Here is an excerpt: The problem here is that the kernel is trying to allocate a contiguous section of 2^7=128 pages, which is 512 KB. This is way too much: kernel pages tend to get fragmented over time and kernel developers often go to great lengths to try allocating at most only 1 contiguous page at a time whenever they can. From the error message, it looks like the culprit is unionfs, but this is misleading: unionfs is the name of the userspace process that was running when the system ran out of memory, but it wasn't unionfs who was allocating the memory: it was the kernel; specifically it was the v9fs_dir_readdir_dotl() function, which is the code for handling the readdir() function in the 9p filesystem (the filesystem that is used to share a directory structure between a qemu host and its VM). If you look at the code, here's what it's doing at the moment it tries to allocate memory: buflen = fid->clnt->msize - P9_IOHDRSZ; rdir = v9fs_alloc_rdir_buf(file, buflen); If you look into v9fs_alloc_rdir_buf(), you will see that it will try to allocate a contiguous buffer of memory (using kzalloc(), which is a wrapper around kmalloc()) of size buflen + 8 bytes or so. So in reality, this code actually allocates a buffer of size proportional to fid->clnt->msize. What is this msize? If you follow the definition of the structures, you will see that it's the negotiated buffer transfer size between 9p client and 9p server. On the client side, it can be controlled with the msize mount option. What this all means is that, the reason for running out of memory is that the code (which we can't easily change) tries to allocate a contiguous buffer of size more or less equal to "negotiated 9p protocol buffer size", which seems to be way too big (in our NixOS tests, at least). After that initial finding, @lethalman tested the gnome3 gdm test without setting the msize parameter at all and it seems to have resolved the problem. The reason why I'm committing this without testing against all of the NixOS VM test is basically that I think we can only go better but not worse than the current state. Signed-off-by: aszlig --- nixos/modules/virtualisation/qemu-vm.nix | 6 +++--- pkgs/build-support/vm/default.nix | 4 ++-- pkgs/build-support/vm/windows/controller/default.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b1f36cf3264..0cefd618075 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -426,19 +426,19 @@ in ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; - options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose"; + options = "trans=virtio,version=9p2000.L,cache=loose"; neededForBoot = true; }; "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose"; + options = "trans=virtio,version=9p2000.L,cache=loose"; neededForBoot = true; }; "/tmp/shared" = { device = "shared"; fsType = "9p"; - options = "trans=virtio,version=9p2000.L,msize=1048576"; + options = "trans=virtio,version=9p2000.L"; neededForBoot = true; }; } // optionalAttrs cfg.writableStore diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 250f2b0fbce..ebcbf8c87b5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -118,7 +118,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose + mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -127,7 +127,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 0beaf401758..1c8e6af83b8 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -48,11 +48,11 @@ let mount -t proc none /fs/proc mount -t 9p \ - -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ + -o trans=virtio,version=9p2000.L,cache=loose \ store /fs/nix/store mount -t 9p \ - -o trans=virtio,version=9p2000.L,msize=262144,cache=loose \ + -o trans=virtio,version=9p2000.L,cache=loose \ xchg /fs/xchg echo root:x:0:0::/root:/bin/false > /fs/etc/passwd From 6353f580f90c0fdd2b418fa853a78ec508bda2a5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Dec 2015 17:36:22 +0100 Subject: [PATCH 380/498] nixos/qemu-vm: Disable cache for $NIX_DISK_IMAGE As @domenkozar noted in #10828, cache=writeback seems to do more harm than good: https://github.com/NixOS/nixpkgs/issues/10828#issuecomment-164426821 He has tested it using the openstack NixOS tests and found that cache=none significantly improves startup performance. Signed-off-by: aszlig --- nixos/modules/virtualisation/qemu-vm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0cefd618075..e90e319a36b 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -76,14 +76,14 @@ let -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ From 00934bb90865b6ccd3b226c7d495adbf4dabc9da Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Dec 2015 17:39:55 +0100 Subject: [PATCH 381/498] nixos/tests: Revert setting min_free_kbytes This reverts commit 02b568414d509b5d06dbd95bcc0868d487ed359e. With a5bc11f and 6353f58 in place, we really don't need this anymore. After running about 500 VM tests on my Hydra, it still didn't improve very much. Signed-off-by: aszlig --- nixos/modules/testing/test-instrumentation.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index c1dbfe305dd..f37bbd0246d 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -88,10 +88,6 @@ let kernel = config.boot.kernelPackages.kernel; in boot.consoleLogLevel = 7; - # Make sure we don't hit page allocation failures if the VM's memory is - # heavily fragmented. - boot.kernel.sysctl."vm.min_free_kbytes" = 16384; - # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 150 ""; networking.nameservers = mkOverride 150 [ ]; From f7e2f8844defc5608baad8c1c8b2c807c46bd750 Mon Sep 17 00:00:00 2001 From: Simon Vandel Sillesen Date: Mon, 14 Dec 2015 18:01:59 +0100 Subject: [PATCH 382/498] sundtek: 2015-09-07 -> 2015-12-12 --- pkgs/misc/drivers/sundtek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index b3a3252a4a2..2587765da68 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "2015-09-07"; + version = "2015-12-12"; rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; platform = with stdenv; if isx86_64 then "64bit" @@ -15,7 +15,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; - sha256 = "159221lxxs5a37akamp8jc3b5ny36451mgjljajvck0c6qb6fkpr"; + sha256 = "0pjg4xww25z36dp64az4gdc0fxhz51f5kb8zvj03hqc774fxzpbq"; }; name = "sundtek-${version}"; From 268102ce2a810a80e2b4da7ecbf241672f03fcc6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 14 Dec 2015 18:27:31 +0100 Subject: [PATCH 383/498] units: add readline dependency The dependency on `readline` is for tab-completion support. This commit also enables tests and adds meta information. --- pkgs/tools/misc/units/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 6a7c3b130bd..3fc015c7704 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, readline }: + stdenv.mkDerivation rec { name = "units-${version}"; version = "2.12"; @@ -8,8 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1jxvjknz2jhq773jrwx9gc1df3gfy73yqmkjkygqxzpi318yls3q"; }; - meta = { + buildInputs = [ readline ]; + + doCheck = true; + + meta = with stdenv.lib; { description = "Unit conversion tool"; - platforms = stdenv.lib.platforms.linux; + homepage = https://www.gnu.org/software/units/; + license = [ licenses.gpl3Plus ]; + platforms = stdenv.lib.platforms.all; }; } From a77569fd972d0afc2bfb1da9f37bd5e2a6781e50 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 02:46:04 +0900 Subject: [PATCH 384/498] jumanji: fixed source --- pkgs/applications/networking/browsers/jumanji/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index 1969a1f502f..0e962f5fc1f 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20150107"; src = fetchgit { - url = git://pwmt.org/jumanji.git; + url = https://git.pwmt.org/pwmt/jumanji.git; rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151"; sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9"; }; From 7e1ce60869c0056e6ca2b121f886feea68474fc7 Mon Sep 17 00:00:00 2001 From: Mate Kovacs Date: Mon, 14 Dec 2015 10:00:24 -0800 Subject: [PATCH 385/498] pythonPackages.pyrr: init at 0.7.0 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b673629b36..b99133f39d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14788,6 +14788,27 @@ in modules // { }; }; + pyrr = buildPythonPackage rec { + name = "pyrr-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyrr/pyrr-${version}.tar.gz"; + sha256 = "ddfcd83394e9703138a3c668747df3548a81238d8ab36d4bf6a84d25ea90b2cd"; + }; + + # ImportError: No module named tests + doCheck = false; + + propagatedBuildInputs = with self; [ multipledispatch numpy ]; + + meta = { + description = "3D mathematical functions using NumPy"; + homepage = https://github.com/adamlwgriffiths/Pyrr/; + license = licenses.bsd2; + }; + }; + pyx = buildPythonPackage rec { name = "pyx-${version}"; version = "0.14.1"; From f22aefbba0117c84ce72a67a57d33d2f69bbbd3e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 03:41:14 +0900 Subject: [PATCH 386/498] vips: 8.0.2 -> 8.1.1 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index a411080c390..153611e0587 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "vips-8.0.2"; + name = "vips-8.1.1"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "0fpshv71sxbkbycxgd2hvwn7fyq9rm0rsgq0b1zld1an88mi0v8y"; + sha256 = "014sgpqj832vl5k212jv25sjakrsifnspjfclywpmn7cwaqwjlvx"; }; buildInputs = From 45e335aabdde8e8b8488801c0736442c8fe9aeb6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Dec 2015 20:29:10 +0100 Subject: [PATCH 387/498] linux-testing: 4.4.0-rc4 -> 4.4.0-rc5 Upstream changes can be found at: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc5 Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 54ad2183382..5cc5b2e8bca 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc4"; - modDirVersion = "4.4.0-rc4"; + version = "4.4-rc5"; + modDirVersion = "4.4.0-rc5"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "040ddm61rifscssnycd1lq9bfni3yrsdrrgg172rb9h5d7ya6981"; + sha256 = "0qr1a8nmq6csbsw4cbqnn3m37a0fapj7a7cm9vj7fy7kq1rgxkpb"; }; features.iwlwifi = true; From 60df14b4b1ae40b726b68e91c5a45f823d4a7e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 14 Dec 2015 21:12:51 +0100 Subject: [PATCH 388/498] fix eval --- pkgs/applications/misc/playonlinux/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c79d9c037d1..731cf5a6ba9 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,8 @@ , pkgsi686Linux }: +assert stdenv.isLinux; + let version = "4.2.9"; From a900bf6e158f930917cdcab51ca7cbae6b2295c8 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Sat, 12 Dec 2015 11:46:43 -0800 Subject: [PATCH 389/498] vmtouch: git-20150310 -> 1.0.2 --- pkgs/tools/misc/vmtouch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 767a61c2bb5..34328b339fc 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vmtouch"; - version = "git-20150310"; - name = "${pname}-${version}"; + version = "1.0.2"; + name = "${pname}-git-${version}"; src = fetchFromGitHub { owner = "hoytech"; repo = "vmtouch"; - rev = "4e1b106e59942678c1e6e490e2c7ca7df50eb7a3"; - sha256 = "1m37gvlypyfizd33mfyfha4hhwiyfzsj8gb2h5im6wzis4j15d0y"; + rev = "vmtouch-${version}"; + sha256 = "0m4s1am1r3qp8si3rnc8j2qc7sbf1k3gxvxr6fnpbf8fcfhh6cay"; }; buildInputs = [perl]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = "http://hoytech.com/vmtouch/vmtouch.html"; + homepage = "http://hoytech.com/vmtouch/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; From 8f7561dba2e5e475440f5e6accfa790ef070987f Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 14 Dec 2015 13:22:15 -0800 Subject: [PATCH 390/498] emacsPackagesNg: update various packages, add seq.el - circe, lcs, lui, shorten, tracking: 1.5 -> 2.1 - expand-region: 20141012 -> 20150902 - flycheck: 0.23 -> 0.25.1 - haskell-mode: 13.14 -> 13.16 - magit: 2.3.0 -> 2.3.1 - projectile: 0.12.0 -> 0.13.0 - seq: init at 1.11 - smartparens: 1.6.2 -> 20151025 - swiper: 0.6.0 -> 0.7.0 --- pkgs/top-level/emacs-packages.nix | 100 ++++++++++++++---------------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3882153d8e0..2acb4cbbe0b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -392,15 +392,15 @@ let packagesFun = super: self: with self; { circe = melpaBuild rec { pname = "circe"; - version = "1.5"; + version = "2.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; rev = "v${version}"; - sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q"; }; packageRequires = [ lcs lui ]; - fileSpecs = [ "lisp/circe*.el" ]; + fileSpecs = [ "circe*.el" "irc.el" "make-tls-process.el" ]; meta = { description = "IRC client for Emacs"; license = gpl3Plus; @@ -676,12 +676,12 @@ let packagesFun = super: self: with self; { expand-region = melpaBuild rec { pname = "expand-region"; - version = "20141012"; + version = "20150902"; src = fetchFromGitHub { owner = "magnars"; repo = "${pname}.el"; - rev = "fa413e07c97997d950c92d6012f5442b5c3cee78"; - sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045"; + rev = "59f67115263676de5345581216640019975c4fda"; + sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1"; }; meta = { description = "Increases the selected region by semantic units in Emacs"; @@ -744,14 +744,14 @@ let packagesFun = super: self: with self; { flycheck = melpaBuild rec { pname = "flycheck"; - version = "0.23"; + version = "0.25.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1ydk1wa7h7z9qw7prfvszxrmy2dyzsdij3xdy10rq197xnrw94wz"; + sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi"; }; - packageRequires = [ dash let-alist pkg-info ]; + packageRequires = [ dash let-alist pkg-info seq ]; meta = { description = "On-the-fly syntax checking, intended as replacement for the older Flymake which is part of Emacs"; license = gpl3Plus; @@ -1016,12 +1016,12 @@ let packagesFun = super: self: with self; { haskell-mode = melpaBuild rec { pname = "haskell-mode"; - version = "13.14"; + version = "13.16"; src = fetchFromGitHub { owner = "haskell"; repo = pname; rev = "v${version}"; - sha256 = "1mxr2cflgafcr8wkvgbq8l3wmc9qhhb7bn9zl1bkf10zspw9m58z"; + sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv"; }; meta = { description = "Haskell language support for Emacs"; @@ -1077,6 +1077,7 @@ let packagesFun = super: self: with self; { }; }; + # deprecated, part of haskell-mode now hi2 = melpaBuild rec { pname = "hi2"; version = "1.0"; @@ -1179,14 +1180,9 @@ let packagesFun = super: self: with self; { lcs = melpaBuild rec { pname = "lcs"; - version = "1.5"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "circe"; - rev = "v${version}"; - sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; - }; - fileSpecs = [ "lisp/lcs*.el" ]; + version = circe.version; + src = circe.src; + fileSpecs = [ "lcs.el" ]; meta = { description = "Longest Common Sequence (LCS) library for Emacs"; license = gpl3Plus; @@ -1227,15 +1223,10 @@ let packagesFun = super: self: with self; { lui = melpaBuild rec { pname = "lui"; - version = "1.5"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "circe"; - rev = "v${version}"; - sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; - }; + version = circe.version; + src = circe.src; packageRequires = [ tracking ]; - fileSpecs = [ "lisp/lui*.el" ]; + fileSpecs = [ "lui*.el" ]; meta = { description = "User interface library for Emacs"; license = gpl3Plus; @@ -1244,12 +1235,12 @@ let packagesFun = super: self: with self; { magit = melpaBuild rec { pname = "magit"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8"; + sha256 = "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd"; }; packageRequires = [ dash git-commit magit-popup with-editor ]; fileSpecs = [ "lisp/magit-utils.el" @@ -1538,12 +1529,12 @@ let packagesFun = super: self: with self; { projectile = melpaBuild rec { pname = "projectile"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = pname; rev = "v${version}"; - sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m"; + sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf"; }; fileSpecs = [ "projectile.el" ]; packageRequires = [ dash helm pkg-info ]; @@ -1717,16 +1708,26 @@ let packagesFun = super: self: with self; { }; }; + seq = melpaBuild rec { + pname = "seq"; + version = "1.11"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "${pname}.el"; + rev = version; + sha256 = "18ydaz2y5n7h4wr0dx2k9qbxl0mc50qfwk52ma4amk8nmm1bjwgc"; + }; + meta = { + description = "Sequence manipulation library for Emacs"; + license = gpl3Plus; # probably + }; + }; + shorten = melpaBuild rec { pname = "shorten"; - version = "1.5"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "circe"; - rev = "v${version}"; - sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; - }; - fileSpecs = [ "lisp/shorten*.el" ]; + version = circe.version; + src = circe.src; + fileSpecs = [ "shorten.el" ]; meta = { description = "String shortening to unique prefix library for Emacs"; license = gpl3Plus; @@ -1751,12 +1752,12 @@ let packagesFun = super: self: with self; { smartparens = melpaBuild rec { pname = "smartparens"; - version = "1.6.2"; + version = "20151025"; src = fetchFromGitHub { owner = "Fuco1"; repo = pname; - rev = version; - sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc"; + rev = "85583f9570be58f17ccd68388d9d4e58234d8ae9"; + sha256 = "1pvzcrnzvksx1rzrr19256x1qhidr2acz6yipijlfx2zfjx2gxa7"; }; packageRequires = [ dash ]; meta = { @@ -1803,12 +1804,12 @@ let packagesFun = super: self: with self; { swiper = melpaBuild rec { pname = "swiper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = pname; rev = version; - sha256 = "18madh4hvrk8sxrll84ry13n1l3ad1gnp3prj828sszrbbdp20ly"; + sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm"; }; fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ]; meta = { @@ -1837,15 +1838,10 @@ let packagesFun = super: self: with self; { tracking = melpaBuild rec { pname = "tracking"; - version = "1.5"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "circe"; - rev = "v${version}"; - sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; - }; + version = circe.version; + src = circe.src; packageRequires = [ shorten ]; - fileSpecs = [ "lisp/tracking*.el" ]; + fileSpecs = [ "tracking.el" ]; meta = { description = "Register buffers for user review library for Emacs"; license = gpl3Plus; From 0a35ffaacee8b5d6f7f97139bc4eff88384171ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Dec 2015 02:12:14 +0100 Subject: [PATCH 391/498] ms-sys: deprecate mssys attribute name --- pkgs/tools/misc/{mssys => ms-sys}/default.nix | 0 pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/tools/misc/{mssys => ms-sys}/default.nix (100%) diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/ms-sys/default.nix similarity index 100% rename from pkgs/tools/misc/mssys/default.nix rename to pkgs/tools/misc/ms-sys/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142ea8d114c..8ae54685bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2317,7 +2317,7 @@ let msf = callPackage ../tools/security/metasploit { }; - mssys = callPackage ../tools/misc/mssys { }; + ms-sys = callPackage ../tools/misc/ms-sys { }; mtdutils = callPackage ../tools/filesystems/mtdutils { }; @@ -15770,6 +15770,7 @@ aliases = with self; rec { pidginlatexSF = pidginlatex; # added 2014-11-02 tftp_hpa = tftp-hpa; # added 2015-04-03 manpages = man-pages; # added 2015-12-06 + mssys = ms-sys; # added 2015-12-13 }; tweakAlias = _n: alias: with lib; From 04728887e1adaa67b41c8f52eb3fc3476442518c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Dec 2015 03:09:21 +0100 Subject: [PATCH 392/498] ms-sys: 2.4.1 -> 2.5.1 --- pkgs/tools/misc/ms-sys/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index d1f76a10130..376d0ea6ad5 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchurl, gettext}: +{ stdenv, fetchurl, gettext }: +let version = "2.5.1"; in stdenv.mkDerivation rec { name = "ms-sys-${version}"; - version = "2.4.1"; - + src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; - sha256 = "0qccv67fc2q97218b9wm6qpmx0nc0ssca391i0q15351y1na78nc"; + sha256 = "1vw8yvcqb6iccs4x7rgk09mqrazkalmpxxxsxmvxn32jzdzl5b26"; }; - buildInputs = [gettext]; + buildInputs = [ gettext ]; - preBuild = '' - makeFlags=(PREFIX=$out) - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = { + inherit version; homepage = http://ms-sys.sourceforge.net/; license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; From d0323d406a66d28fd0def44bae9d4a3b0c28f2f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Dec 2015 23:24:32 +0100 Subject: [PATCH 393/498] mksh: 51 -> 52 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘This release has a nonzero chance to break existing scripts that use some extension features – I had to quote some tildes in dot.mkshrc and a variable expansion in ${x/y"$z"} in MirWebseite (the $z) – twice!. As usual, test!’ -- https://www.mirbsd.org/permalinks/news_e20151212-tg.htm --- pkgs/shells/mksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 397b38180eb..f55a7cd5d84 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, groff }: -let version = "51"; in +let version = "52"; in stdenv.mkDerivation { name = "mksh-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1pyscl3w4aw067a5hb8mczy3z545jz1dwx9n2b09k09xydgsmvlz"; + sha256 = "13vnncwfx4zq3yi7llw3p6miw0px1bm5rrps3y1nlfn6sb6zbhj5"; }; buildInputs = [ groff ]; From 75df6e05c3be5cfeae2231bad77b3d07a083b390 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Dec 2015 23:34:47 +0100 Subject: [PATCH 394/498] mksh: maintainers += nckx --- pkgs/shells/mksh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index f55a7cd5d84..4e1570a3838 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.mirbsd.org/mksh.htm"; license = licenses.free; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres nckx ]; platforms = platforms.unix; }; } From 29ab5c3b9c176bef496d33510499622f445783bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Dec 2015 00:20:59 +0100 Subject: [PATCH 395/498] simple-scan: 3.19.2 -> 3.19.3 --- pkgs/applications/graphics/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 4dd30697f0b..c205c2a3f1c 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: -let version = "3.19.2"; in +let version = "3.19.3"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "08454ky855iaiq5wn9rdbfal3i4fjss5fn5mg6cmags50wy9spsg"; + sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; From bcc4ca029adfbb0e21803cfcf50c8ee8000c422d Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 6 Dec 2015 20:36:05 +0100 Subject: [PATCH 396/498] Add rebar3 package --- lib/maintainers.nix | 1 + .../tools/build-managers/rebar3/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/build-managers/rebar3/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 596b8a49a10..2776f5837f3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -119,6 +119,7 @@ gebner = "Gabriel Ebner "; gfxmonk = "Tim Cuthbertson "; giogadi = "Luis G. Torres "; + gleber = "Gleb Peregud "; globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix new file mode 100644 index 00000000000..2e75a12bbfc --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, erlang }: + + +let + version = "3.0.0-beta.4"; +in +stdenv.mkDerivation { + name = "rebar3-${version}"; + + src = fetchurl { + url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; + sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy"; + }; + + buildInputs = [ erlang ]; + + buildPhase = '' + HOME=. escript bootstrap + ''; + installPhase = '' + mkdir -p $out/bin + cp rebar3 $out/bin/rebar3 + ''; + + meta = { + homepage = "https://github.com/rebar/rebar3"; + description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases."; + + longDescription = '' + rebar is a self-contained Erlang script, so it's easy to distribute or + even embed directly in a project. Where possible, rebar uses standard + Erlang/OTP conventions for project structures, thus minimizing the amount + of build configuration work. rebar also provides dependency management, + enabling application writers to easily re-use common libraries from a + variety of locations (hex.pm, git, hg, and so on). + ''; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.gleber ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a88ed84b3fc..23dcf0c3b24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5019,6 +5019,7 @@ let erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; + rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; elixir = callPackage ../development/interpreters/elixir { }; From 2c36e9cf5ff9171bf5619c088a2f875ec3af0ad1 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 10:22:00 +0900 Subject: [PATCH 397/498] slurm-llnl: 14.11.5 -> 14-11-5-1 --- pkgs/servers/computing/slurm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index a1a1a2ea1f2..57263d04723 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-llnl-${version}"; - version = "14.11.5"; + version = "14-11-5-1"; src = fetchurl { - url = "http://www.schedmd.com/download/latest/slurm-${version}.tar.bz2"; - sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2"; + url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; + sha256 = "0vn2jkj83zgc4j656vm24lihapg3w3sfnzpsmynlk4r0v9cy2vcw"; }; buildInputs = [ python munge perl pam openssl mysql.lib ]; From c393711b4320c8939a44dc5af73e9e8c83dc0cff Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 11:56:28 +0900 Subject: [PATCH 398/498] praat: 5417 -> 5.4.17 --- pkgs/applications/audio/praat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 03ba33b4834..883d49682ce 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: -let version = "5417"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "praat-${version}"; + version = "5.4.17"; src = fetchurl { - url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; - sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl"; + url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; + sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; }; configurePhase = '' From 7f0080ac321672bc85084ccc2516e68a13f8fb8e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 15 Dec 2015 09:03:08 +0100 Subject: [PATCH 399/498] python ansible, ansible2, mygpoclient: fix platforms --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cabd4e81e1f..958cd90faab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -607,7 +607,7 @@ in modules // { description = "A simple automation tool"; license = with licenses; [ gpl3] ; maintainers = with maintainers; [ joamaki ]; - platforms = with platforms; [ linux darwin ]; + platforms = with platforms; linux ++ darwin; }; }; @@ -639,7 +639,7 @@ in modules // { description = "A simple automation tool"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ copumpkin ]; - platforms = with platforms; [ linux darwin ]; + platforms = with platforms; linux ++ darwin; }; }; @@ -10539,7 +10539,7 @@ in modules // { ''; homepage = https://thp.io/2010/mygpoclient/; license = with licenses; [ gpl3 ]; - platforms = with platforms; [ linux darwin ]; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ skeidel ]; }; }; From c087ea5f812ccb18994992d67085da6a4ad231ca Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 15 Dec 2015 09:37:57 +0000 Subject: [PATCH 400/498] zip: fixed build phase (i.e. unicode support) The build did not use the current build infrastructure correctly. As a consequence zip lacked support for unicode and 64bit files. --- pkgs/tools/archivers/zip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index e4da0236cdf..585bc72ad96 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -13,11 +13,9 @@ stdenv.mkDerivation { sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; - # should be makeFlags on all archs, not changed yet to prevent rebuild - buildFlags="-f unix/Makefile generic"; - makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null; - - installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; + makefile = "unix/Makefile"; + buildFlags = if stdenv.isCygwin then "cygwin" else "generic"; + installFlags = "prefix=$(out) INSTALL=cp"; patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; From 903803a1f379951c68224f847ccdf717fcf2d36c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Dec 2015 10:10:59 +0000 Subject: [PATCH 401/498] Allow uploading multiple files --- maintainers/scripts/copy-tarballs.pl | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 6be1300e513..ad626e4bd8d 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -69,15 +69,24 @@ sub uploadFile { redirect "sha512/$sha512_32", $mainKey; } -my $op = $ARGV[0] // ""; +my $op = shift @ARGV; if ($op eq "--file") { - my $fn = $ARGV[1] // die "$0: --file requires a file name\n"; - if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { - print STDERR "$fn is already mirrored\n"; - } else { - uploadFile($fn, basename $fn); + my $res = 0; + foreach my $fn (@ARGV) { + eval { + if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { + print STDERR "$fn is already mirrored\n"; + } else { + uploadFile($fn, basename $fn); + } + }; + if ($@) { + warn "$@\n"; + $res = 1; + } } + exit $res; } elsif ($op eq "--expr") { @@ -138,5 +147,5 @@ elsif ($op eq "--expr") { } else { - die "Syntax: $0 --file FILENAME | --expr EXPR\n"; + die "Syntax: $0 --file FILENAMES... | --expr EXPR\n"; } From a6ca6bbed95c1f29ef71b6005645e454f76e6080 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Dec 2015 10:47:31 +0000 Subject: [PATCH 402/498] copy-tarballs.pl: Fix --expr --- maintainers/scripts/copy-tarballs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index ad626e4bd8d..d0b4afd8774 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -92,7 +92,7 @@ if ($op eq "--file") { elsif ($op eq "--expr") { # Evaluate find-tarballs.nix. - my $expr = $ARGV[1] // die "$0: --expr requires a Nix expression\n"; + my $expr = $ARGV[0] // die "$0: --expr requires a Nix expression\n"; my $pid = open(JSON, "-|", "nix-instantiate", "--eval-only", "--json", "--strict", "", "--arg", "expr", $expr); From 64a2b7f11cbcef841b32384a0be1a3c56740efa5 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 10:47:20 +0900 Subject: [PATCH 403/498] logkeys: 5ef6b0dcb9e3 -> 2015-11-10 --- pkgs/tools/security/logkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index ba875c04e2b..b856308712f 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "logkeys-${version}"; - version = "5ef6b0dcb9e3"; + version = "2015-11-10"; src = fetchgit { url = https://github.com/kernc/logkeys; - rev = "5ef6b0dcb9e38e6137ad1579d624ec12107c56c3"; - sha256 = "02p0l92l0fq069g31ks6xbqavzxa9njj9460vw2jsa7livcn2z9d"; + rev = "78321c6e70f61c1e7e672fa82daa664017c9e69d"; + sha256 = "1b1fa1rblyfsg6avqyls03y0rq0favipn5fha770rsirzg4r637q"; }; buildInputs = [ which procps kbd ]; From 6d3a89f6dac5a3eedbe70ff2e2993f0cba242a93 Mon Sep 17 00:00:00 2001 From: System administrator Date: Tue, 15 Dec 2015 10:19:29 +0100 Subject: [PATCH 404/498] terraria-server: add dedicated server version 1308 for Linux x86_64 fix fix limit to 64bit linux --- pkgs/games/terraria-server/default.nix | 39 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/games/terraria-server/default.nix diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix new file mode 100644 index 00000000000..4eeefc2801b --- /dev/null +++ b/pkgs/games/terraria-server/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, file, fetchurl }: +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "terraria-server-${version}"; + version = "1308"; + + src = fetchurl { + url = http://terraria.org/server/terraria-server-linux-1308.tar.gz; + sha256 = "0cx3nx7wmzcw9l0nz9zm4amccl8nrd09hlb3jc1yrqcaswbyxc8a"; + }; + + buildInputs = [ file ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/ + ln -s $out/terraria-server-linux-${version}/TerrariaServer.bin.x86_64 $out/bin/TerrariaServer + + # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. + echo "running patchelf on prebuilt binaries:" + find "$out" | while read filepath; do + if file "$filepath" | grep -q "ELF.*executable"; then + echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" + patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" + test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } + fi + done + ''; + + meta = with lib; { + homepage = http://terraria.org; + description = "Dedicated server for the main game"; + platforms = platforms.linux; + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986004c5642..aa00cf443e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14266,6 +14266,8 @@ let tennix = callPackage ../games/tennix { }; + terraria-server = callPackage ../games/terraria-server/default.nix { }; + tibia = callPackage_i686 ../games/tibia { }; tintin = callPackage ../games/tintin { }; From a05e2dbe6507820439ea647f4079790dae32f8d5 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 00:12:37 +0100 Subject: [PATCH 405/498] Add few erlang modules --- .../erlang-modules/build-erlang.nix | 60 ++++++++++++++ pkgs/development/erlang-modules/build-hex.nix | 79 +++++++++++++++++++ pkgs/development/erlang-modules/default.nix | 38 +++++++++ .../erlang-modules/hex/goldrush.nix | 11 +++ .../erlang-modules/hex/ibrowse.nix | 10 +++ pkgs/development/erlang-modules/hex/jiffy.nix | 10 +++ pkgs/development/erlang-modules/hex/lager.nix | 12 +++ pkgs/development/erlang-modules/hex/meck.nix | 10 +++ pkgs/top-level/all-packages.nix | 2 + 9 files changed, 232 insertions(+) create mode 100644 pkgs/development/erlang-modules/build-erlang.nix create mode 100644 pkgs/development/erlang-modules/build-hex.nix create mode 100644 pkgs/development/erlang-modules/default.nix create mode 100644 pkgs/development/erlang-modules/hex/goldrush.nix create mode 100644 pkgs/development/erlang-modules/hex/ibrowse.nix create mode 100644 pkgs/development/erlang-modules/hex/jiffy.nix create mode 100644 pkgs/development/erlang-modules/hex/lager.nix create mode 100644 pkgs/development/erlang-modules/hex/meck.nix diff --git a/pkgs/development/erlang-modules/build-erlang.nix b/pkgs/development/erlang-modules/build-erlang.nix new file mode 100644 index 00000000000..fcb22a40193 --- /dev/null +++ b/pkgs/development/erlang-modules/build-erlang.nix @@ -0,0 +1,60 @@ +{ stdenv, erlang, rebar, openssl, libyaml }: + +{ name, version +, buildInputs ? [], erlangDeps ? [] +, postPatch ? "" +, ... }@attrs: + +with stdenv.lib; + +stdenv.mkDerivation (attrs // { + name = "${name}-${version}"; + + buildInputs = buildInputs ++ [ erlang rebar openssl libyaml ]; + + postPatch = '' + rm -f rebar + if [ -e "src/${name}.app.src" ]; then + sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" + fi + ${postPatch} + ''; + + configurePhase = let + getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); + recursiveDeps = uniqList { + inputList = flatten (map getDeps erlangDeps); + }; + in '' + runHook preConfigure + ${concatMapStrings (dep: '' + header "linking erlang dependency ${dep}" + mkdir deps + ln -s "${dep}" "deps/${dep.packageName}" + stopNest + '') recursiveDeps} + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + rebar compile + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + for reldir in src ebin priv include; do + [ -e "$reldir" ] || continue + mkdir "$out" + cp -rt "$out" "$reldir" + success=1 + done + runHook postInstall + ''; + + passthru = { + packageName = name; + inherit erlangDeps; + }; +}) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix new file mode 100644 index 00000000000..03edaaf481c --- /dev/null +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -0,0 +1,79 @@ +{ stdenv, erlang, rebar3, openssl, libyaml }: + +{ name, version +, buildInputs ? [], erlangDeps ? [] +, postPatch ? "" +, ... }@attrs: + +with stdenv.lib; + +stdenv.mkDerivation (attrs // { + name = "${name}-${version}"; + + buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; + + postPatch = '' + rm -f rebar rebar3 + if [ -e "src/${name}.app.src" ]; then + sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" + fi + ${postPatch} + ''; + + # unpackCmd = "(mkdir cron && cd cron && sh $curSrc)"; + unpackCmd = '' + tar -xf $curSrc contents.tar.gz + mkdir contents + tar -C contents -xzf contents.tar.gz + # rm -rf CHECKSUM contents.tar.gz metadata.config VERSION + ''; + + configurePhase = let + getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); + recursiveDeps = uniqList { + inputList = flatten (map getDeps erlangDeps); + }; + in '' + runHook preConfigure + mkdir -p _build/default/lib/ + ${concatMapStrings (dep: '' + header "linking erlang dependency ${dep}" + ln -s "${dep}" "_build/default/lib/${dep.packageName}" + stopNest + '') recursiveDeps} + ls -laR + cat rebar.config || true + cat rebar.lock || true + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + DEBUG=1 HOME=. rebar3 update + DEBUG=1 HOME=. rebar3 compile + runHook postBuild + ''; + + installPhase = '' + ls -laR + runHook preInstall + mkdir "$out" + for reldir in src ebin priv include; do + fd="_build/default/lib/${name}/$reldir" + [ -d "$fd" ] || continue + cp -Hrt "$out" "$fd" + success=1 + done + runHook postInstall + ''; + + # src = fetchurl { + # url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${name}-${version}.tar"; + # sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; + # }; + + passthru = { + packageName = name; + inherit erlangDeps; + }; +}) diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix new file mode 100644 index 00000000000..0dfe2472c38 --- /dev/null +++ b/pkgs/development/erlang-modules/default.nix @@ -0,0 +1,38 @@ +{ pkgs }: #? import {} }: + +let + callPackage = pkgs.lib.callPackageWith (pkgs // self); + + self = rec { + buildErlang = callPackage ./build-erlang.nix {}; + buildHex = callPackage ./build-hex.nix {}; + + # dependencies for ejabberd + p1_utils = callPackage ./hex/p1_utils.nix {}; + cache_tab = callPackage ./hex/cache_tab.nix {}; + stringprep = callPackage ./hex/stringprep.nix {}; + p1_xml = callPackage ./hex/p1_xml.nix {}; + p1_tls = callPackage ./hex/p1_tls.nix {}; + p1_stun = callPackage ./hex/p1_stun.nix {}; + esip = callPackage ./hex/esip.nix {}; + p1_yaml = callPackage ./hex/p1_yaml.nix {}; + xmlrpc = callPackage ./hex/xmlrpc.nix {}; + jiffy = callPackage ./hex/jiffy.nix {}; + sync = callPackage ./hex/sync.nix {}; + erlang-katana = callPackage ./hex/erlang-katana.nix {}; + eper = callPackage ./hex/eper.nix {}; + + goldrush = callPackage ./hex/goldrush.nix {}; + lager = callPackage ./hex/lager.nix {}; + getopt = callPackage ./hex/getopt.nix {}; + meck = callPackage ./hex/meck.nix {}; + ibrowse = callPackage ./hex/ibrowse.nix {}; + aleppo = callPackage ./hex/aleppo.nix {}; + zipper = callPackage ./hex/zipper.nix {}; + erlang-github = callPackage ./hex/erlang-github.nix {}; + + elvis = callPackage ./hex/elvis.nix {}; + apns = callPackage ./hex/apns.nix {}; + appmon = callPackage ./hex/appmon.nix {}; + }; +in self diff --git a/pkgs/development/erlang-modules/hex/goldrush.nix b/pkgs/development/erlang-modules/hex/goldrush.nix new file mode 100644 index 00000000000..ff4c5892ee9 --- /dev/null +++ b/pkgs/development/erlang-modules/hex/goldrush.nix @@ -0,0 +1,11 @@ +{ buildHex, fetchurl }: + +buildHex { + name = "goldrush"; + version = "0.1.7"; + src = fetchurl { + url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/goldrush-0.1.7.tar"; + sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; + }; + +} diff --git a/pkgs/development/erlang-modules/hex/ibrowse.nix b/pkgs/development/erlang-modules/hex/ibrowse.nix new file mode 100644 index 00000000000..d742a8904ce --- /dev/null +++ b/pkgs/development/erlang-modules/hex/ibrowse.nix @@ -0,0 +1,10 @@ +{ buildErlang, fetchgit }: + +buildErlang { + name = "ibrowse"; + version = "0.1"; + src = fetchgit { + url = "git://github.com/cmullaparthi/ibrowse.git"; + sha256 = "1qvz4bmh307avjsxmhhdf35dd5wzmii0cbf6jyvvlhhkq4y0nmnj"; + }; +} \ No newline at end of file diff --git a/pkgs/development/erlang-modules/hex/jiffy.nix b/pkgs/development/erlang-modules/hex/jiffy.nix new file mode 100644 index 00000000000..762086da23f --- /dev/null +++ b/pkgs/development/erlang-modules/hex/jiffy.nix @@ -0,0 +1,10 @@ +{ buildErlang, fetchgit }: + +buildErlang { + name = "jiffy"; + version = "0.1"; + src = fetchgit { + url = "git://github.com/davisp/jiffy.git"; + sha256 = "02qb8m4s2p51m5f882ifsaph9fwx0bih37q5q90ba8cvsak65isx"; + }; +} \ No newline at end of file diff --git a/pkgs/development/erlang-modules/hex/lager.nix b/pkgs/development/erlang-modules/hex/lager.nix new file mode 100644 index 00000000000..c46c759b948 --- /dev/null +++ b/pkgs/development/erlang-modules/hex/lager.nix @@ -0,0 +1,12 @@ +{ buildHex, fetchurl, goldrush }: + +buildHex { + name = "lager"; + version = "3.0.2"; + src = fetchurl { + url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/lager-3.0.2.tar"; + sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; + }; + + erlangDeps = [ goldrush ]; +} diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix new file mode 100644 index 00000000000..a361147aab4 --- /dev/null +++ b/pkgs/development/erlang-modules/hex/meck.nix @@ -0,0 +1,10 @@ +{ buildErlang, fetchgit }: + +buildErlang { + name = "meck"; + version = "0.1"; + src = fetchgit { + url = "git://github.com/eproxus/meck.git"; + sha256 = "077p3v81mspy69247bz4apln3gp567m4xpmzxmdjd6pyh6m5ahpk"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23dcf0c3b24..4f24112cf54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5021,6 +5021,8 @@ let rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + erlangPackages = callPackage ../development/erlang-modules { }; + elixir = callPackage ../development/interpreters/elixir { }; groovy = callPackage ../development/interpreters/groovy { }; From 6dcbe059e15c7d17da9f57e67c9fddc74b836230 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 21:21:05 +0100 Subject: [PATCH 406/498] Automagically download files from hex.pm tarball S3 repo --- pkgs/development/erlang-modules/build-hex.nix | 18 ++++++------------ .../erlang-modules/hex/goldrush.nix | 6 +----- pkgs/development/erlang-modules/hex/lager.nix | 8 ++------ 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index 03edaaf481c..f7fc4d8836d 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,6 +1,6 @@ -{ stdenv, erlang, rebar3, openssl, libyaml }: +{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl }: -{ name, version +{ name, version, sha256 , buildInputs ? [], erlangDeps ? [] , postPatch ? "" , ... }@attrs: @@ -20,12 +20,10 @@ stdenv.mkDerivation (attrs // { ${postPatch} ''; - # unpackCmd = "(mkdir cron && cd cron && sh $curSrc)"; unpackCmd = '' tar -xf $curSrc contents.tar.gz mkdir contents tar -C contents -xzf contents.tar.gz - # rm -rf CHECKSUM contents.tar.gz metadata.config VERSION ''; configurePhase = let @@ -41,9 +39,6 @@ stdenv.mkDerivation (attrs // { ln -s "${dep}" "_build/default/lib/${dep.packageName}" stopNest '') recursiveDeps} - ls -laR - cat rebar.config || true - cat rebar.lock || true runHook postConfigure ''; @@ -55,7 +50,6 @@ stdenv.mkDerivation (attrs // { ''; installPhase = '' - ls -laR runHook preInstall mkdir "$out" for reldir in src ebin priv include; do @@ -67,10 +61,10 @@ stdenv.mkDerivation (attrs // { runHook postInstall ''; - # src = fetchurl { - # url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${name}-${version}.tar"; - # sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; - # }; + src = fetchurl { + url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${name}-${version}.tar"; + sha256 = sha256; + }; passthru = { packageName = name; diff --git a/pkgs/development/erlang-modules/hex/goldrush.nix b/pkgs/development/erlang-modules/hex/goldrush.nix index ff4c5892ee9..ddff7f6cc56 100644 --- a/pkgs/development/erlang-modules/hex/goldrush.nix +++ b/pkgs/development/erlang-modules/hex/goldrush.nix @@ -3,9 +3,5 @@ buildHex { name = "goldrush"; version = "0.1.7"; - src = fetchurl { - url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/goldrush-0.1.7.tar"; - sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; - }; - + sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9"; } diff --git a/pkgs/development/erlang-modules/hex/lager.nix b/pkgs/development/erlang-modules/hex/lager.nix index c46c759b948..acfefd5757c 100644 --- a/pkgs/development/erlang-modules/hex/lager.nix +++ b/pkgs/development/erlang-modules/hex/lager.nix @@ -1,12 +1,8 @@ -{ buildHex, fetchurl, goldrush }: +{ buildHex, goldrush }: buildHex { name = "lager"; version = "3.0.2"; - src = fetchurl { - url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/lager-3.0.2.tar"; - sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; - }; - + sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj"; erlangDeps = [ goldrush ]; } From 2251a942fce820b77ee03bdfd659e03c5711f578 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 21:39:13 +0100 Subject: [PATCH 407/498] Add support for Hex package name There are some packages on Hex which have custom hex-specific names, but inside there's a base project name. Remove most packages andadd ibrowse, meck, jiffy --- pkgs/development/erlang-modules/build-hex.nix | 7 +++-- pkgs/development/erlang-modules/default.nix | 28 ++----------------- .../erlang-modules/hex/ibrowse.nix | 14 ++++------ pkgs/development/erlang-modules/hex/jiffy.nix | 14 ++++------ pkgs/development/erlang-modules/hex/meck.nix | 13 ++++----- 5 files changed, 24 insertions(+), 52 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index f7fc4d8836d..d9191baeb81 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,6 +1,7 @@ { stdenv, erlang, rebar3, openssl, libyaml, fetchurl }: { name, version, sha256 +, hexPkg ? name , buildInputs ? [], erlangDeps ? [] , postPatch ? "" , ... }@attrs: @@ -44,8 +45,8 @@ stdenv.mkDerivation (attrs // { buildPhase = '' runHook preBuild - DEBUG=1 HOME=. rebar3 update - DEBUG=1 HOME=. rebar3 compile + HOME=. rebar3 update + HOME=. rebar3 compile runHook postBuild ''; @@ -62,7 +63,7 @@ stdenv.mkDerivation (attrs // { ''; src = fetchurl { - url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${name}-${version}.tar"; + url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${hexPkg}-${version}.tar"; sha256 = sha256; }; diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index 0dfe2472c38..87447220bb7 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -7,32 +7,10 @@ let buildErlang = callPackage ./build-erlang.nix {}; buildHex = callPackage ./build-hex.nix {}; - # dependencies for ejabberd - p1_utils = callPackage ./hex/p1_utils.nix {}; - cache_tab = callPackage ./hex/cache_tab.nix {}; - stringprep = callPackage ./hex/stringprep.nix {}; - p1_xml = callPackage ./hex/p1_xml.nix {}; - p1_tls = callPackage ./hex/p1_tls.nix {}; - p1_stun = callPackage ./hex/p1_stun.nix {}; - esip = callPackage ./hex/esip.nix {}; - p1_yaml = callPackage ./hex/p1_yaml.nix {}; - xmlrpc = callPackage ./hex/xmlrpc.nix {}; - jiffy = callPackage ./hex/jiffy.nix {}; - sync = callPackage ./hex/sync.nix {}; - erlang-katana = callPackage ./hex/erlang-katana.nix {}; - eper = callPackage ./hex/eper.nix {}; - goldrush = callPackage ./hex/goldrush.nix {}; - lager = callPackage ./hex/lager.nix {}; - getopt = callPackage ./hex/getopt.nix {}; - meck = callPackage ./hex/meck.nix {}; ibrowse = callPackage ./hex/ibrowse.nix {}; - aleppo = callPackage ./hex/aleppo.nix {}; - zipper = callPackage ./hex/zipper.nix {}; - erlang-github = callPackage ./hex/erlang-github.nix {}; - - elvis = callPackage ./hex/elvis.nix {}; - apns = callPackage ./hex/apns.nix {}; - appmon = callPackage ./hex/appmon.nix {}; + jiffy = callPackage ./hex/jiffy.nix {}; + lager = callPackage ./hex/lager.nix {}; + meck = callPackage ./hex/meck.nix {}; }; in self diff --git a/pkgs/development/erlang-modules/hex/ibrowse.nix b/pkgs/development/erlang-modules/hex/ibrowse.nix index d742a8904ce..6ed189eb39d 100644 --- a/pkgs/development/erlang-modules/hex/ibrowse.nix +++ b/pkgs/development/erlang-modules/hex/ibrowse.nix @@ -1,10 +1,8 @@ -{ buildErlang, fetchgit }: +{ buildHex }: -buildErlang { +buildHex { name = "ibrowse"; - version = "0.1"; - src = fetchgit { - url = "git://github.com/cmullaparthi/ibrowse.git"; - sha256 = "1qvz4bmh307avjsxmhhdf35dd5wzmii0cbf6jyvvlhhkq4y0nmnj"; - }; -} \ No newline at end of file + version = "4.2.2"; + sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q"; +} + diff --git a/pkgs/development/erlang-modules/hex/jiffy.nix b/pkgs/development/erlang-modules/hex/jiffy.nix index 762086da23f..b9f92c888a4 100644 --- a/pkgs/development/erlang-modules/hex/jiffy.nix +++ b/pkgs/development/erlang-modules/hex/jiffy.nix @@ -1,10 +1,8 @@ -{ buildErlang, fetchgit }: +{ buildHex }: -buildErlang { +buildHex { name = "jiffy"; - version = "0.1"; - src = fetchgit { - url = "git://github.com/davisp/jiffy.git"; - sha256 = "02qb8m4s2p51m5f882ifsaph9fwx0bih37q5q90ba8cvsak65isx"; - }; -} \ No newline at end of file + version = "0.14.5"; + hexPkg = "barrel_jiffy"; + sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa"; +} diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix index a361147aab4..f0a4da5392c 100644 --- a/pkgs/development/erlang-modules/hex/meck.nix +++ b/pkgs/development/erlang-modules/hex/meck.nix @@ -1,10 +1,7 @@ -{ buildErlang, fetchgit }: +{ buildHex }: -buildErlang { +buildHex { name = "meck"; - version = "0.1"; - src = fetchgit { - url = "git://github.com/eproxus/meck.git"; - sha256 = "077p3v81mspy69247bz4apln3gp567m4xpmzxmdjd6pyh6m5ahpk"; - }; -} \ No newline at end of file + version = "0.8.3"; + sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak"; +} From 406b974420a4faec0b2fb819b1be8344c02b76c8 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 22:39:42 +0100 Subject: [PATCH 408/498] Add "compilePorts" enabling rebar3 "pc" plugin If compilePorts is enabled plugin "pc" is added to the rebar.config during postPatch. This makes rebar3 compile download the plugin, hence added TODO. --- pkgs/development/erlang-modules/build-hex.nix | 13 +++++++++++++ pkgs/development/erlang-modules/default.nix | 1 + pkgs/development/erlang-modules/hex/esqlite.nix | 8 ++++++++ 3 files changed, 22 insertions(+) create mode 100644 pkgs/development/erlang-modules/hex/esqlite.nix diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index d9191baeb81..d5c71f882ff 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -4,6 +4,7 @@ , hexPkg ? name , buildInputs ? [], erlangDeps ? [] , postPatch ? "" +, compilePorts ? false , ... }@attrs: with stdenv.lib; @@ -18,6 +19,16 @@ stdenv.mkDerivation (attrs // { if [ -e "src/${name}.app.src" ]; then sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" fi + + # TODO: figure out how to provide 'pc' plugin hermetically + ${if compilePorts then '' + echo "{plugins, [pc]}. + {provider_hooks, + [{post, + [{compile, {pc, compile}}, + {clean, {pc, clean}}]}]}." >> rebar.config + '' else ''''} + ${postPatch} ''; @@ -43,6 +54,8 @@ stdenv.mkDerivation (attrs // { runHook postConfigure ''; + # TODO: figure out how to provide rebar3 a static registry snapshot to make + # this hermetic buildPhase = '' runHook preBuild HOME=. rebar3 update diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index 87447220bb7..8bcf0ddb6a1 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -7,6 +7,7 @@ let buildErlang = callPackage ./build-erlang.nix {}; buildHex = callPackage ./build-hex.nix {}; + esqlite = callPackage ./hex/esqlite.nix {}; goldrush = callPackage ./hex/goldrush.nix {}; ibrowse = callPackage ./hex/ibrowse.nix {}; jiffy = callPackage ./hex/jiffy.nix {}; diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix new file mode 100644 index 00000000000..af7a1266712 --- /dev/null +++ b/pkgs/development/erlang-modules/hex/esqlite.nix @@ -0,0 +1,8 @@ +{ buildHex }: + +buildHex { + name = "esqlite"; + version = "0.2.1"; + sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; + compilePorts = true; +} From eac25eaf69b8df9da28b1f94cb009320671ce32a Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 22:50:19 +0100 Subject: [PATCH 409/498] Simplify patch and move pc compile call into buildPhase --- pkgs/development/erlang-modules/build-hex.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index d5c71f882ff..f6b873f433a 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -22,11 +22,7 @@ stdenv.mkDerivation (attrs // { # TODO: figure out how to provide 'pc' plugin hermetically ${if compilePorts then '' - echo "{plugins, [pc]}. - {provider_hooks, - [{post, - [{compile, {pc, compile}}, - {clean, {pc, clean}}]}]}." >> rebar.config + echo "{plugins, [pc]}." >> rebar.config '' else ''''} ${postPatch} @@ -58,8 +54,8 @@ stdenv.mkDerivation (attrs // { # this hermetic buildPhase = '' runHook preBuild - HOME=. rebar3 update - HOME=. rebar3 compile + HOME=. rebar3 do update, compile + HOME=. rebar3 pc compile runHook postBuild ''; From 3a9110b15ccd0ab33e07147f443a63ac567a7681 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Thu, 10 Dec 2015 23:11:25 +0100 Subject: [PATCH 410/498] Add support for rebar3 plugins to buildHex. Allow specifying pluginDeps for buildHex listing rebar3 plugins which are required for given package to be built by rebar3. --- pkgs/development/erlang-modules/build-hex.nix | 14 ++++++++++++-- pkgs/development/erlang-modules/default.nix | 1 + pkgs/development/erlang-modules/hex/esqlite.nix | 3 ++- pkgs/development/erlang-modules/hex/rebar3-pc.nix | 7 +++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/erlang-modules/hex/rebar3-pc.nix diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index f6b873f433a..e664d357d85 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -2,7 +2,7 @@ { name, version, sha256 , hexPkg ? name -, buildInputs ? [], erlangDeps ? [] +, buildInputs ? [], erlangDeps ? [], pluginDeps ? [] , postPatch ? "" , compilePorts ? false , ... }@attrs: @@ -39,14 +39,22 @@ stdenv.mkDerivation (attrs // { recursiveDeps = uniqList { inputList = flatten (map getDeps erlangDeps); }; + recursivePluginsDeps = uniqList { + inputList = flatten (map getDeps pluginDeps); + }; in '' runHook preConfigure - mkdir -p _build/default/lib/ + mkdir -p _build/default/{lib,plugins}/ ${concatMapStrings (dep: '' header "linking erlang dependency ${dep}" ln -s "${dep}" "_build/default/lib/${dep.packageName}" stopNest '') recursiveDeps} + ${concatMapStrings (dep: '' + header "linking rebar3 plugins ${dep}" + ln -s "${dep}" "_build/default/plugins/${dep.packageName}" + stopNest + '') recursivePluginsDeps} runHook postConfigure ''; @@ -55,7 +63,9 @@ stdenv.mkDerivation (attrs // { buildPhase = '' runHook preBuild HOME=. rebar3 do update, compile + ${if compilePorts then '' HOME=. rebar3 pc compile + '' else ''''} runHook postBuild ''; diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index 8bcf0ddb6a1..84590e12a1c 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -7,6 +7,7 @@ let buildErlang = callPackage ./build-erlang.nix {}; buildHex = callPackage ./build-hex.nix {}; + rebar3-pc = callPackage ./hex/rebar3-pc.nix {}; esqlite = callPackage ./hex/esqlite.nix {}; goldrush = callPackage ./hex/goldrush.nix {}; ibrowse = callPackage ./hex/ibrowse.nix {}; diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix index af7a1266712..7bcd69c0555 100644 --- a/pkgs/development/erlang-modules/hex/esqlite.nix +++ b/pkgs/development/erlang-modules/hex/esqlite.nix @@ -1,8 +1,9 @@ -{ buildHex }: +{ buildHex, rebar3-pc }: buildHex { name = "esqlite"; version = "0.2.1"; sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; compilePorts = true; + pluginDeps = [ rebar3-pc ]; } diff --git a/pkgs/development/erlang-modules/hex/rebar3-pc.nix b/pkgs/development/erlang-modules/hex/rebar3-pc.nix new file mode 100644 index 00000000000..5bc45d3e3ab --- /dev/null +++ b/pkgs/development/erlang-modules/hex/rebar3-pc.nix @@ -0,0 +1,7 @@ +{ buildHex, goldrush }: + +buildHex { + name = "pc"; + version = "1.1.0"; + sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma"; +} From 5d3680d26516b35a04cd02b6e95122c46bd243a5 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Fri, 11 Dec 2015 00:00:33 +0100 Subject: [PATCH 411/498] Fetch hex.pm registry snapshot with external github repo. This allows to avoid fetching registry file from S3 at build time, making the build hermetic and much faster. Automatic tools will be used to update said external repo content when Hex packages are imported/update. --- pkgs/development/erlang-modules/build-hex.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index e664d357d85..efeda1c6373 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,4 +1,4 @@ -{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl }: +{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl, fetchFromGitHub }: { name, version, sha256 , hexPkg ? name @@ -14,7 +14,14 @@ stdenv.mkDerivation (attrs // { buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - postPatch = '' + postPatch = let + registrySnapshot = fetchFromGitHub { + owner = "gleber"; + repo = "hex-pm-registry-snapshots"; + rev = "48147b0"; + sha256 = "0ibfnhrhbka4n6wkhs99fpy3sjab54ip37jgvx2hcfhfr4pxhbxw"; + }; + in '' rm -f rebar rebar3 if [ -e "src/${name}.app.src" ]; then sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" @@ -25,6 +32,9 @@ stdenv.mkDerivation (attrs // { echo "{plugins, [pc]}." >> rebar.config '' else ''''} + mkdir -p _build/default/{lib,plugins}/ ./.cache/rebar3/hex/default/ + zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry + ${postPatch} ''; @@ -44,7 +54,6 @@ stdenv.mkDerivation (attrs // { }; in '' runHook preConfigure - mkdir -p _build/default/{lib,plugins}/ ${concatMapStrings (dep: '' header "linking erlang dependency ${dep}" ln -s "${dep}" "_build/default/lib/${dep.packageName}" @@ -62,7 +71,7 @@ stdenv.mkDerivation (attrs // { # this hermetic buildPhase = '' runHook preBuild - HOME=. rebar3 do update, compile + HOME=. rebar3 compile ${if compilePorts then '' HOME=. rebar3 pc compile '' else ''''} From 13a1ab440c6a1d6b16dd927339f305d3a53139fe Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sat, 12 Dec 2015 08:23:33 +0100 Subject: [PATCH 412/498] Replace deprecated uniqList with unique function --- pkgs/development/erlang-modules/build-hex.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index efeda1c6373..777a5c5047f 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -46,12 +46,8 @@ stdenv.mkDerivation (attrs // { configurePhase = let getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); - recursiveDeps = uniqList { - inputList = flatten (map getDeps erlangDeps); - }; - recursivePluginsDeps = uniqList { - inputList = flatten (map getDeps pluginDeps); - }; + recursiveDeps = unique (flatten (map getDeps erlangDeps)); + recursivePluginsDeps = unique (flatten (map getDeps pluginDeps)); in '' runHook preConfigure ${concatMapStrings (dep: '' From 7e57b20abc0f23c27eb7b315cb4bf0596160ab67 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sat, 12 Dec 2015 08:54:57 +0100 Subject: [PATCH 413/498] Add rebar3-pc to plugin deps automatically if compilePorts is enabled --- pkgs/development/erlang-modules/build-hex.nix | 6 ++++-- pkgs/development/erlang-modules/hex/esqlite.nix | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index 777a5c5047f..6a1f4172bbd 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,4 +1,5 @@ -{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl, fetchFromGitHub }: +{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl, fetchFromGitHub, + rebar3-pc }: { name, version, sha256 , hexPkg ? name @@ -45,9 +46,10 @@ stdenv.mkDerivation (attrs // { ''; configurePhase = let + plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []); getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); recursiveDeps = unique (flatten (map getDeps erlangDeps)); - recursivePluginsDeps = unique (flatten (map getDeps pluginDeps)); + recursivePluginsDeps = unique (flatten (map getDeps plugins)); in '' runHook preConfigure ${concatMapStrings (dep: '' diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix index 7bcd69c0555..1fc3a2e91dc 100644 --- a/pkgs/development/erlang-modules/hex/esqlite.nix +++ b/pkgs/development/erlang-modules/hex/esqlite.nix @@ -5,5 +5,4 @@ buildHex { version = "0.2.1"; sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr"; compilePorts = true; - pluginDeps = [ rebar3-pc ]; } From 2a7e77cac5497450eaf1712d906a2ac0a15c2d9b Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sat, 12 Dec 2015 14:36:45 +0100 Subject: [PATCH 414/498] Move registrySnapshot into it's own file for easier automation. --- pkgs/development/erlang-modules/build-hex.nix | 7 +------ pkgs/development/erlang-modules/registrySnapshot.nix | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/erlang-modules/registrySnapshot.nix diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index 6a1f4172bbd..6fd8983d411 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -16,12 +16,7 @@ stdenv.mkDerivation (attrs // { buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; postPatch = let - registrySnapshot = fetchFromGitHub { - owner = "gleber"; - repo = "hex-pm-registry-snapshots"; - rev = "48147b0"; - sha256 = "0ibfnhrhbka4n6wkhs99fpy3sjab54ip37jgvx2hcfhfr4pxhbxw"; - }; + registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; }; in '' rm -f rebar rebar3 if [ -e "src/${name}.app.src" ]; then diff --git a/pkgs/development/erlang-modules/registrySnapshot.nix b/pkgs/development/erlang-modules/registrySnapshot.nix new file mode 100644 index 00000000000..cca3dd0c56b --- /dev/null +++ b/pkgs/development/erlang-modules/registrySnapshot.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "gleber"; + repo = "hex-pm-registry-snapshots"; + rev = "48147b0"; + sha256 = "0ibfnhrhbka4n6wkhs99fpy3sjab54ip37jgvx2hcfhfr4pxhbxw"; +} From acaf2c179ee5884f330ad6acd5362377319cce87 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 13 Dec 2015 00:03:42 +0100 Subject: [PATCH 415/498] Allow specifying meta for buildHex and buildErlang. Adds "meta" for meck package as a test. --- pkgs/development/erlang-modules/build-erlang.nix | 5 +++++ pkgs/development/erlang-modules/build-hex.nix | 5 +++++ pkgs/development/erlang-modules/hex/meck.nix | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/erlang-modules/build-erlang.nix b/pkgs/development/erlang-modules/build-erlang.nix index fcb22a40193..19320f0394c 100644 --- a/pkgs/development/erlang-modules/build-erlang.nix +++ b/pkgs/development/erlang-modules/build-erlang.nix @@ -3,6 +3,7 @@ { name, version , buildInputs ? [], erlangDeps ? [] , postPatch ? "" +, meta ? {} , ... }@attrs: with stdenv.lib; @@ -53,6 +54,10 @@ stdenv.mkDerivation (attrs // { runHook postInstall ''; + meta = { + inherit (erlang.meta) platforms; + } // meta; + passthru = { packageName = name; inherit erlangDeps; diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index 6fd8983d411..a14cd3add55 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -6,6 +6,7 @@ , buildInputs ? [], erlangDeps ? [], pluginDeps ? [] , postPatch ? "" , compilePorts ? false +, meta ? {} , ... }@attrs: with stdenv.lib; @@ -88,6 +89,10 @@ stdenv.mkDerivation (attrs // { sha256 = sha256; }; + meta = { + inherit (erlang.meta) platforms; + } // meta; + passthru = { packageName = name; inherit erlangDeps; diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix index f0a4da5392c..5af8a15a908 100644 --- a/pkgs/development/erlang-modules/hex/meck.nix +++ b/pkgs/development/erlang-modules/hex/meck.nix @@ -1,7 +1,13 @@ -{ buildHex }: +{ stdenv, buildHex }: buildHex { name = "meck"; version = "0.8.3"; sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak"; + + meta = { + description = "A mocking framework for Erlang"; + homepage = "https://github.com/eproxus/meck"; + license = stdenv.lib.licenses.apsl20; + }; } From 033902d2694f957fee66b16c815869b187969e91 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 13 Dec 2015 23:12:08 +0100 Subject: [PATCH 416/498] Refactor fetchHex out of buildHex. This will allow to reuse this code to fetch rebar3's dependencies to ensure it's hermetic build. --- pkgs/development/erlang-modules/build-hex.nix | 19 ++++------- .../tools/build-managers/rebar3/fetch-hex.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/tools/build-managers/rebar3/fetch-hex.nix diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index a14cd3add55..bb01c3fb505 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -1,4 +1,4 @@ -{ stdenv, erlang, rebar3, openssl, libyaml, fetchurl, fetchFromGitHub, +{ stdenv, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub, rebar3-pc }: { name, version, sha256 @@ -16,6 +16,12 @@ stdenv.mkDerivation (attrs // { buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; + src = fetchHex { + pkg = hexPkg; + inherit version; + inherit sha256; + }; + postPatch = let registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; }; in '' @@ -35,12 +41,6 @@ stdenv.mkDerivation (attrs // { ${postPatch} ''; - unpackCmd = '' - tar -xf $curSrc contents.tar.gz - mkdir contents - tar -C contents -xzf contents.tar.gz - ''; - configurePhase = let plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []); getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); @@ -84,11 +84,6 @@ stdenv.mkDerivation (attrs // { runHook postInstall ''; - src = fetchurl { - url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${hexPkg}-${version}.tar"; - sha256 = sha256; - }; - meta = { inherit (erlang.meta) platforms; } // meta; diff --git a/pkgs/development/tools/build-managers/rebar3/fetch-hex.nix b/pkgs/development/tools/build-managers/rebar3/fetch-hex.nix new file mode 100644 index 00000000000..1b1378c10cb --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/fetch-hex.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +{ pkg, version, sha256 +, meta ? {} +}: + +with stdenv.lib; + +stdenv.mkDerivation ({ + name = "hex-source-${pkg}-${version}"; + + src = fetchurl { + url = "https://s3.amazonaws.com/s3.hex.pm/tarballs/${pkg}-${version}.tar"; + inherit sha256; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + unpackCmd = '' + tar -xf $curSrc contents.tar.gz + mkdir contents + tar -C contents -xzf contents.tar.gz + ''; + + installPhase = '' + runHook preInstall + mkdir "$out" + cp -Hrt "$out" . + success=1 + runHook postInstall + ''; + + inherit meta; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f24112cf54..82a148bedcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5020,6 +5020,7 @@ let rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; erlangPackages = callPackage ../development/erlang-modules { }; From 4ba1a51b7ff8162a92f624e3ddc7ada21bd8289e Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 13 Dec 2015 14:06:35 +0100 Subject: [PATCH 417/498] Move registry to rebar3, since it needs it itself to be bootstrapped. This makes rebar3 build a bit more hermetic. Next stage is to pull in rebar3 plugins dependencies for bootstrap to pick up. --- pkgs/development/erlang-modules/build-hex.nix | 10 ++-------- .../tools/build-managers/rebar3/default.nix | 10 +++++++++- .../build-managers/rebar3}/registrySnapshot.nix | 0 3 files changed, 11 insertions(+), 9 deletions(-) rename pkgs/development/{erlang-modules => tools/build-managers/rebar3}/registrySnapshot.nix (100%) diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix index bb01c3fb505..041a7db48a9 100644 --- a/pkgs/development/erlang-modules/build-hex.nix +++ b/pkgs/development/erlang-modules/build-hex.nix @@ -22,21 +22,17 @@ stdenv.mkDerivation (attrs // { inherit sha256; }; - postPatch = let - registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; }; - in '' + postPatch = '' rm -f rebar rebar3 if [ -e "src/${name}.app.src" ]; then sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" fi - # TODO: figure out how to provide 'pc' plugin hermetically ${if compilePorts then '' echo "{plugins, [pc]}." >> rebar.config '' else ''''} - mkdir -p _build/default/{lib,plugins}/ ./.cache/rebar3/hex/default/ - zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry + ${rebar3.setupRegistry} ${postPatch} ''; @@ -61,8 +57,6 @@ stdenv.mkDerivation (attrs // { runHook postConfigure ''; - # TODO: figure out how to provide rebar3 a static registry snapshot to make - # this hermetic buildPhase = '' runHook preBuild HOME=. rebar3 compile diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 2e75a12bbfc..f905622413a 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchurl, erlang }: +{ stdenv, fetchurl, erlang, tree, fetchFromGitHub }: let version = "3.0.0-beta.4"; + registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; }; + setupRegistry = '' + mkdir -p _build/default/{lib,plugins,packages}/ ./.cache/rebar3/hex/default/ + zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry + ''; in stdenv.mkDerivation { name = "rebar3-${version}"; @@ -13,8 +18,11 @@ stdenv.mkDerivation { }; buildInputs = [ erlang ]; + inherit setupRegistry; + buildPhase = '' + ${setupRegistry} HOME=. escript bootstrap ''; installPhase = '' diff --git a/pkgs/development/erlang-modules/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix similarity index 100% rename from pkgs/development/erlang-modules/registrySnapshot.nix rename to pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix From 108f3cf67fee2a7c8fd52710b65f386f773499e0 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 13 Dec 2015 14:07:53 +0100 Subject: [PATCH 418/498] Add patch which makes rebar compilation hermetic --- .../tools/build-managers/rebar3/default.nix | 2 + .../rebar3/hermetic-bootstrap.patch | 78 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index f905622413a..841e0b71f42 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy"; }; + patches = [ ./hermetic-bootstrap.patch ]; + buildInputs = [ erlang ]; inherit setupRegistry; diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch new file mode 100644 index 00000000000..13d60fdcc91 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch @@ -0,0 +1,78 @@ +diff --git a/bootstrap b/bootstrap +index 25bd658..b2a986b 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -8,9 +8,6 @@ main(_Args) -> + application:start(asn1), + application:start(public_key), + application:start(ssl), +- inets:start(), +- inets:start(httpc, [{profile, rebar}]), +- set_httpc_options(), + + %% Fetch and build deps required to build rebar3 + BaseDeps = [{providers, []} +@@ -33,7 +30,6 @@ main(_Args) -> + + setup_env(), + os:putenv("REBAR_PROFILE", "bootstrap"), +- rebar3:run(["update"]), + {ok, State} = rebar3:run(["compile"]), + reset_env(), + os:putenv("REBAR_PROFILE", ""), +@@ -71,33 +67,7 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) -> + compile(Name, ErlFirstFiles). + + fetch({pkg, Name, Vsn}, App) -> +- Dir = filename:join([filename:absname("_build/default/lib/"), App]), +- CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs", +- Package = binary_to_list(<>), +- Url = string:join([CDN, Package], "/"), +- case request(Url) of +- {ok, Binary} -> +- {ok, Contents} = extract(Binary), +- ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]); +- _ -> +- io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn]) +- end. +- +-extract(Binary) -> +- {ok, Files} = erl_tar:extract({binary, Binary}, [memory]), +- {"contents.tar.gz", Contents} = lists:keyfind("contents.tar.gz", 1, Files), +- {ok, Contents}. +- +-request(Url) -> +- case httpc:request(get, {Url, []}, +- [{relaxed, true}], +- [{body_format, binary}], +- rebar) of +- {ok, {{_Version, 200, _Reason}, _Headers, Body}} -> +- {ok, Body}; +- Error -> +- Error +- end. ++ ok. + + get_rebar_config() -> + {ok, [[Home]]} = init:get_argument(home), +@@ -109,20 +79,6 @@ get_rebar_config() -> + [] + end. + +-get_http_vars(Scheme) -> +- proplists:get_value(Scheme, get_rebar_config(), []). +- +-set_httpc_options() -> +- set_httpc_options(https_proxy, get_http_vars(https_proxy)), +- set_httpc_options(proxy, get_http_vars(http_proxy)). +- +-set_httpc_options(_, []) -> +- ok; +- +-set_httpc_options(Scheme, Proxy) -> +- {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy), +- httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar). +- + compile(App, FirstFiles) -> + Dir = filename:join(filename:absname("_build/default/lib/"), App), + filelib:ensure_dir(filename:join([Dir, "ebin", "dummy.beam"])), From f579307cfe0c443e31185e940fa93db2ddb7448c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Mon, 14 Dec 2015 12:31:37 -0500 Subject: [PATCH 419/498] .mention-bot: remove illegal comment (close #11488) --- .mention-bot | 1 - 1 file changed, 1 deletion(-) diff --git a/.mention-bot b/.mention-bot index 36e38ed82b9..4c200e30279 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,5 +1,4 @@ { - // users in this list will never be mentioned by mention-bot "userBlacklist": [ "civodul" ] From 474da3bf244603d3ad51fb460a9cd07cdbd53b46 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Tue, 15 Dec 2015 00:03:05 +0100 Subject: [PATCH 420/498] Add sources of specific rebar bootstrap deps via new fetchHex derivation. --- .../tools/build-managers/rebar3/default.nix | 84 ++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 841e0b71f42..c4e256d5873 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, tree, fetchFromGitHub }: +{ stdenv, fetchurl, fetchHex, erlang, tree, fetchFromGitHub }: let @@ -8,6 +8,68 @@ let mkdir -p _build/default/{lib,plugins,packages}/ ./.cache/rebar3/hex/default/ zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry ''; + # TODO: all these below probably should go into nixpkgs.erlangModules.sources.* + # {erlware_commons, "0.16.0"}, + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "0.16.0"; + sha256 = "0kh24d0001390wfx28d0xa874vrsfvjgj41g315vg4hac632krxx"; + }; + # {ssl_verify_hostname, "1.0.5"}, + ssl_verify_hostname = fetchHex { + pkg = "ssl_verify_hostname"; + version = "1.0.5"; + sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj"; + }; + # {certifi, "0.1.1"}, + certifi = fetchHex { + pkg = "certifi"; + version = "0.1.1"; + sha256 = "0afylwqg74gprbg116asz0my2nipmki0512c8mdiq6xdiyjdvlg6"; + }; + # {providers, "1.5.0"}, + providers = fetchHex { + pkg = "providers"; + version = "1.5.0"; + sha256 = "1hc8sp2l1mmx9dfpmh1f8j9hayfg7541rmx05wb9cmvxvih7zyvf"; + }; + # {getopt, "0.8.2"}, + getopt = fetchHex { + pkg = "getopt"; + version = "0.8.2"; + sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; + }; + # {bbmustache, "1.0.4"}, + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.0.4"; + sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03"; + }; + # {relx, "3.8.0"}, + relx = fetchHex { + pkg = "relx"; + version = "3.8.0"; + sha256 = "0y89iirjz3kc1rzkdvc6p3ssmwcm2hqgkklhgm4pkbc14fcz57hq"; + }; + # {cf, "0.2.1"}, + cf = fetchHex { + pkg = "cf"; + version = "0.2.1"; + sha256 = "19d0yvg8wwa57cqhn3vqfvw978nafw8j2rvb92s3ryidxjkrmvms"; + }; + # {cth_readable, "1.1.0"}, + cth_readable = fetchHex { + pkg = "cth_readable"; + version = "1.0.1"; + sha256 = "1cnc4fbypckqllfi5h73rdb24dz576k3177gzvp1kbymwkp1xcz1"; + }; + # {eunit_formatters, "0.2.0"} + eunit_formatters = fetchHex { + pkg = "eunit_formatters"; + version = "0.2.0"; + sha256 = "03kiszlbgzscfd2ns7na6bzbfzmcqdb5cx3p6qy3657jk2fai332"; + }; + in stdenv.mkDerivation { name = "rebar3-${version}"; @@ -19,12 +81,28 @@ stdenv.mkDerivation { patches = [ ./hermetic-bootstrap.patch ]; - buildInputs = [ erlang ]; + buildInputs = [ erlang + tree + ]; inherit setupRegistry; + postPatch = '' + echo postPatch + ${setupRegistry} + mkdir -p _build/default/lib/ + cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons + cp --no-preserve=mode -R ${providers} _build/default/lib/providers + cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt + cp --no-preserve=mode -R ${bbmustache} _build/default/lib/bbmustache + cp --no-preserve=mode -R ${certifi} _build/default/lib/certifi + cp --no-preserve=mode -R ${cf} _build/default/lib/cf + cp --no-preserve=mode -R ${cth_readable} _build/default/lib/cth_readable + cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters + cp --no-preserve=mode -R ${relx} _build/default/lib/relx + cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname + ''; buildPhase = '' - ${setupRegistry} HOME=. escript bootstrap ''; installPhase = '' From bb1b5c71948e32c8cd64bfa5ca6d497602dce516 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Tue, 15 Dec 2015 00:53:41 +0100 Subject: [PATCH 421/498] Update hex.pm registry --- .../tools/build-managers/rebar3/registrySnapshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix index cca3dd0c56b..8e9c2a292fd 100644 --- a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix +++ b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "gleber"; repo = "hex-pm-registry-snapshots"; - rev = "48147b0"; - sha256 = "0ibfnhrhbka4n6wkhs99fpy3sjab54ip37jgvx2hcfhfr4pxhbxw"; + rev = "329ae2b"; + sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh"; } From c7738364b5e4520469b9adcc4c32bcf7c2db8348 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 20 Aug 2015 07:56:32 +0100 Subject: [PATCH 422/498] light-locker: init at 1.7.0 --- .../screensavers/light-locker/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/misc/screensavers/light-locker/default.nix diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix new file mode 100644 index 00000000000..48b30bccbdd --- /dev/null +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, which +, xfce +, glib +, pkgconfig +, libX11 +, gtk3 +, dbus_glib +, systemd +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "${basename}-${version}"; + basename = "light-locker"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "the-cavalry"; + repo = basename; + rev = "v${version}"; + sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj"; + }; + + buildInputs = [ which xfce.xfce4_dev_tools glib pkgconfig libX11 gtk3 dbus_glib systemd wrapGAppsHook ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/the-cavalry/light-locker; + description = "light-locker is a simple locker"; + longDescription = '' + light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies. + It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986004c5642..a530e3fa1c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7707,6 +7707,8 @@ let lightning = callPackage ../development/libraries/lightning { }; + lightlocker = callPackage ../misc/screensavers/light-locker { }; + lirc = callPackage ../development/libraries/lirc { }; liquidfun = callPackage ../development/libraries/liquidfun { }; From 9be012f0d4d9b6bca35416ec89d5a40be4556896 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 29 Nov 2015 00:18:59 +0000 Subject: [PATCH 423/498] lightdm & xserver service: add ability to spawn more than one X server - if xserver.tty and/or display are set to null, then don't specify them, or the -logfile argument in the xserverArgs - For lightdm, we set default tty and display to null and we determine those at runtime based on arguments passed. This is necessary because we run multiple X servers so they can't all be on the same display --- .../services/x11/display-managers/default.nix | 2 +- .../services/x11/display-managers/lightdm.nix | 15 +++++++++++---- nixos/modules/services/x11/xserver.nix | 11 ++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ca0832e5b0c..bad99ccd869 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -37,7 +37,7 @@ let # file provided by services.xserver.displayManager.session.script xsession = wm: dm: pkgs.writeScript "xsession" '' - #! /bin/sh + #! ${pkgs.bash}/bin/bash . /etc/profile cd "$HOME" diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index c8ccf43029d..ded694d90d5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -13,9 +13,16 @@ let # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' - #! /bin/sh + #! ${pkgs.bash}/bin/bash ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} + + display=$(echo "$@" | xargs -n 1 | grep -P ^:\\d\$ | head -n 1 | sed s/^://) + if [ -z "$display" ] + then additionalArgs=":0 -logfile /var/log/X.0.log" + else additionalArgs="-logfile /var/log/X.$display.log" + fi + + exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} $additionalArgs "$@" ''; usersConf = writeText "users.conf" @@ -39,7 +46,6 @@ let greeter-session = ${cfg.greeter.name} ${cfg.extraSeatDefaults} ''; - in { # Note: the order in which lightdm greeter modules are imported @@ -98,7 +104,6 @@ in }; config = mkIf cfg.enable { - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { @@ -149,5 +154,7 @@ in services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. + services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 3348e8d0582..8fcca70bc79 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -381,13 +381,13 @@ in }; tty = mkOption { - type = types.int; + type = types.nullOr types.int; default = 7; description = "Virtual console for the X server."; }; display = mkOption { - type = types.int; + type = types.nullOr types.int; default = 0; description = "Display number for the X server."; }; @@ -517,11 +517,12 @@ in services.xserver.displayManager.xserverArgs = [ "-ac" "-terminate" - "-logfile" "/var/log/X.${toString cfg.display}.log" "-config ${configFile}" - ":${toString cfg.display}" "vt${toString cfg.tty}" "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb" - ] ++ optional (!cfg.enableTCP) "-nolisten tcp"; + ] ++ optional (cfg.display != null) ":${tostring cfg.display}" + ++ optional (cfg.tty != null) "vt${toString cfg.tty}" + ++ optional (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ] + ++ optional (!cfg.enableTCP) "-nolisten tcp"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ From 83a8e8e4ef535c10e5e1059bcb5a5498e68ecc3c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 15 Dec 2015 17:04:20 +0300 Subject: [PATCH 424/498] polkit_gnome: cleanup, add platforms --- pkgs/tools/security/polkit-gnome/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index c06aac204a1..38d47e742a2 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: -stdenv.mkDerivation { - name = "polkit-gnome-0.105"; +let + version = "0.105"; + +in stdenv.mkDerivation rec { + name = "polkit-gnome-${version}"; src = fetchurl { - url = mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz; + url = "mirror://gnome/sources/polkit-gnome/${version}/${name}.tar.xz"; sha256 = "0sckmcbxyj6sbrnfc5p5lnw27ccghsid6v6wxq09mgxqcd4lk10p"; }; buildInputs = [ polkit gtk3 ]; nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = "--disable-introspection"; + configureFlags = [ "--disable-introspection" ]; # Desktop file from Debian postInstall = '' @@ -24,5 +27,6 @@ stdenv.mkDerivation { description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + platforms = stdenv.lib.platforms.linux; }; } From b566f73f383c5a0e81a5655384ce27d2a85f667c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Dec 2015 19:14:00 +0100 Subject: [PATCH 425/498] linuxPackages.phc-intel: 0.4.0-rev{18 -> 19} Fixes #11733. Minimum Linux kernel version is now 4.3.x. --- pkgs/os-specific/linux/phc-intel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index dd5a2741267..c3c62dbf5eb 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,20 @@ assert stdenv.isLinux; # Don't bother with older versions, though some would probably work: -assert stdenv.lib.versionAtLeast kernel.version "4.2"; +assert stdenv.lib.versionAtLeast kernel.version "4.3"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; let release = "0.4.0"; - revbump = "rev18"; # don't forget to change forum download id... + revbump = "rev19"; # don't forget to change forum download id... version = "${release}-${revbump}"; in stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { - sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27"; - url = "http://www.linux-phc.org/forum/download/file.php?id=167"; + sha256 = "1apvjp2rpaf3acjvsxgk6xiwrx4n9p565gxvra05pvicwikfiqa8"; + url = "http://www.linux-phc.org/forum/download/file.php?id=168"; name = "phc-intel-pack-${revbump}.tar.bz2"; }; From 36ab097c6ca9a8b46d56e51504a9e55abe067ec1 Mon Sep 17 00:00:00 2001 From: Rene Donner Date: Tue, 15 Dec 2015 18:42:48 +0100 Subject: [PATCH 426/498] julia: 0.4.0 -> 0.4.2 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 5df0a35aae8..81781868b02 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -43,12 +43,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.4.0"; + version = "0.4.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "00k53hzbawpqvmkkyzcvbmf1d0ycshzdqk19nwsifv1rmiwjj7ss"; + sha256 = "04i5kjji5553lkdxz3wgflg1mav5ivwy2dascjy8jprqpq33aknk"; }; prePatch = '' From db9a93f9921c2253a9935970c709012b58b109bc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 20:58:22 +0100 Subject: [PATCH 427/498] ocaml-batteries: 2.3.1 -> 2.4.0 --- pkgs/development/ocaml-modules/batteries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index e83ea743263..06618fff819 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, qtest }: -let version = "2.3.1"; in +let version = "2.4.0"; in stdenv.mkDerivation { name = "ocaml-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "1hjbzczchqnnxbn4ck84j5pi6prgfjfjg14kg26fzqz3gql427rl"; + sha256 = "0bxp5d05w1igwh9vcgvhd8sd6swf2ddsjphw0mkakdck9afnimmd"; }; buildInputs = [ ocaml findlib qtest ]; From 680d909c97afa3348a032b6a3e70b9ad2cc46274 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 21:07:33 +0100 Subject: [PATCH 428/498] ocaml-easy-format: 1.1.0 -> 1.2.0 --- pkgs/development/ocaml-modules/easy-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index bac558cc50a..bbf4d82b519 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, ocaml, findlib }: let pname = "easy-format"; - version = "1.1.0"; + version = "1.2.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "084blm13k5lakl5wq3qfxbd0l0bwblvk928v75xcxpaqwv426w5a"; + sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9"; }; buildInputs = [ ocaml findlib ]; From 038f4ce1d18d6fe3a2796a5a6cfc09d799958601 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 21:36:57 +0100 Subject: [PATCH 429/498] menhir: 20151110 -> 20151112 --- pkgs/development/ocaml-modules/menhir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index c8243f32671..3841027b896 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151110" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151112" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20151110" then "12ijr1gd808f79d7k7ji9zg23xr4szayfgvm6njqamh0jnspq70r" + else if version == "20151112" then "0fhfs96gxnj920h5ydsg7c1qypsbrlzqfn2cqzrg9rfj1qq6wq86" else throw ("menhir: unknown version " ++ version); in From 4a00e1793b26046c4513198306e91018d2597011 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 21:57:54 +0100 Subject: [PATCH 430/498] ocaml-tuntap: init at 1.3.0 --- .../ocaml-modules/tuntap/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tuntap/default.nix diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix new file mode 100644 index 00000000000..de520c643fe --- /dev/null +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip, ocaml, findlib, ipaddr }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +stdenv.mkDerivation { + name = "ocaml-tuntap-1.3.0"; + + src = fetchzip { + url = https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz; + sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ipaddr ]; + + createFindlibDestdir = true; + + meta = { + description = "Bindings to the UNIX tuntap facility"; + license = stdenv.lib.licenses.isc; + homepage = https://github.com/mirage/ocaml-tuntap; + inherit (ocaml.meta) platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6e5918bbf9..3107318c7dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4667,6 +4667,8 @@ let re2 = callPackage ../development/ocaml-modules/re2 { }; + tuntap = callPackage ../development/ocaml-modules/tuntap { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; ulex = callPackage ../development/ocaml-modules/ulex { }; From 23efd0e6179e9166c64d5bddc78e63d7117284bc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 22:02:15 +0100 Subject: [PATCH 431/498] ocaml-hex: 0.2.0 -> 1.0.0 --- pkgs/development/ocaml-modules/hex/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 7a060bd795a..a9d30f1a9e7 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchzip, ocaml, findlib, cstruct }: -let version = "0.2.0"; in +let version = "1.0.0"; in stdenv.mkDerivation { name = "ocaml-hex-${version}"; src = fetchzip { url = "https://github.com/mirage/ocaml-hex/archive/${version}.tar.gz"; - sha256 = "13vmpxwg5vb2qvkdqz37rx1ya19r9cp4dwylx8jj15mn77hpy7xg"; + sha256 = "0g4cq4bsksga15fa5ln083gkglawknbnhi2s4k8yk0yi5xngvwm4"; }; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ cstruct ]; + configureFlags = "--enable-tests"; + doCheck = true; + checkTarget = "test"; createFindlibDestdir = true; meta = { From 48e7eb65f2ecf12b1399395cd11e248e9c676e8f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 15 Dec 2015 22:43:25 +0100 Subject: [PATCH 432/498] ocaml-iso8601: init at 0.2.4 OCaml library for ISO 8601 and RFC 3999 date parsing. Homepage: http://sagotch.github.io/ISO8601.ml/ --- .../ocaml-modules/iso8601/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/iso8601/default.nix diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix new file mode 100644 index 00000000000..4b194332d08 --- /dev/null +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "0.2.4"; in + +stdenv.mkDerivation { + name = "ocaml-iso8601-${version}"; + src = fetchzip { + url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; + sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; + }; + + buildInputs = [ ocaml findlib ]; + createFindlibDestdir = true; + + meta = { + homepage = http://sagotch.github.io/ISO8601.ml/; + description = "ISO 8601 and RFC 3999 date parsing for OCaml"; + license = stdenv.lib.licenses.mit; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3107318c7dc..a6da7cf68ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4522,6 +4522,8 @@ let ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; From 8638952ededa073720052c612d4154a0b0c3cc3f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 15 Dec 2015 22:54:05 +0100 Subject: [PATCH 433/498] pkgs.slurm-llnl: 14-11-5-1 -> 15-08-5-1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 57263d04723..5e55724a290 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-llnl-${version}"; - version = "14-11-5-1"; + version = "15-08-5-1"; src = fetchurl { url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; - sha256 = "0vn2jkj83zgc4j656vm24lihapg3w3sfnzpsmynlk4r0v9cy2vcw"; + sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; }; buildInputs = [ python munge perl pam openssl mysql.lib ]; From a4cd9f771a372af8860529b7ae9667cc2f1d1923 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 15 Dec 2015 23:03:28 +0100 Subject: [PATCH 434/498] rkt: bump version 0.12.0 -> 0.13.0 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 6b3eb079f98..c95ccaaf0a8 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -9,7 +9,7 @@ let stage1Flavours = [ "coreos" ]; in stdenv.mkDerivation rec { - version = "0.12.0"; + version = "0.13.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "1qwj3a4780lqra2c6ncw86lskzqnh59fxk577hgqym4jgxxk4bbv"; + sha256 = "1qx8bzcm5xifr9x2wa83mqz15bk2rpjqabm00wzbqixcyxra9bka"; }; stage1BaseImage = fetchurl { From a2f8812096ac738e039104223d1d5b1eb9adb322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 15 Dec 2015 18:52:13 +0100 Subject: [PATCH 435/498] add numad: daemon that manages application locality --- pkgs/os-specific/linux/numad/default.nix | 27 +++++++++++++++ .../linux/numad/numad-linker-flags.patch | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/os-specific/linux/numad/default.nix create mode 100644 pkgs/os-specific/linux/numad/numad-linker-flags.patch diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix new file mode 100644 index 00000000000..2e88e2c794e --- /dev/null +++ b/pkgs/os-specific/linux/numad/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "numad-0.5"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/${name}.tar.xz"; + sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; + }; + + patches = [ + ./numad-linker-flags.patch + ]; + postPatch = '' + substituteInPlace Makefile --replace "install -m" "install -Dm" + ''; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; + homepage = https://fedoraproject.org/wiki/Features/numad; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ iElectric ]; + }; +} diff --git a/pkgs/os-specific/linux/numad/numad-linker-flags.patch b/pkgs/os-specific/linux/numad/numad-linker-flags.patch new file mode 100644 index 00000000000..97f3dc8b6cf --- /dev/null +++ b/pkgs/os-specific/linux/numad/numad-linker-flags.patch @@ -0,0 +1,33 @@ +From 9eb3cc5c51d846c8c8b750a4eb55545d7b5fea6c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 23 Apr 2014 15:41:26 -0400 +Subject: [PATCH] use LDLIBS for linker flags + +When you put -lfoo into the dependency line of make, it forces it to +search /lib and /usr/lib for files to link against. This can cause +problems when trying to cross-compile or build for different ABIs. +Use the standard LDLIBS variable instead. + +URL: https://bugs.gentoo.org/505760 +Reported-by: Georgi Georgiev +Signed-off-by: Mike Frysinger +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f3838b4..f2e9a6e 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,8 @@ docdir := ${prefix}/share/doc + + all: numad + +-numad: numad.o -lpthread ++LDLIBS := -lpthread ++numad: numad.o + + AR ?= ar + RANLIB ?= ranlib +-- +1.9.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6da7cf68ff..5917e715c14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10353,6 +10353,8 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + numad = callPackage ../os-specific/linux/numad { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (gnome) gtk gtkmm; }; From caa9c53d6eefb9c3df0f929df0eb5cb809649e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 15 Dec 2015 19:17:47 +0100 Subject: [PATCH 436/498] qemu: enable numa --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 13cb7df3479..77903aa9589 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls, nettle +, libseccomp, libaio, libcap_ng, gnutls, nettle, numactl , makeWrapper , pulseSupport ? true, libpulseaudio , sdlSupport ? true, SDL @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls nettle + libcap_ng gnutls nettle numactl ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-seccomp" + "--enable-numa" "--smbd=smbd" # use `smbd' from $PATH "--audio-drv-list=${audio}" "--sysconfdir=/etc" From 0acc32e8369f55e6a6f68c59cd5187d6cac20112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 15 Dec 2015 19:55:39 +0100 Subject: [PATCH 437/498] libvirt: add numa support --- pkgs/development/libraries/libvirt/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e946f27791b..27e67866fe3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq, libnl, libpcap, libxslt, xhtml1 +, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl , pythonPackages, perlPackages }: @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath + libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath numad numactl ]; preConfigure = '' PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH + substituteInPlace configure --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' patchShebangs . # fixes /usr/bin/python references ''; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { "--with-macvtap" "--with-virtualport" "--with-libpcap" + "--with-numad" ]; installFlags = [ @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin + --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin ''; enableParallelBuilding = true; From d66a1a46e6f1f82ad8305d669db5c3a8cca147c3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Dec 2015 00:49:43 +0100 Subject: [PATCH 438/498] colordiff: add archive URL When a new version of colordiff is released the old tarball is moved to the archive directory. This breaks builds until the derivation is updated to the new version. This commit lets fetchurl know about the archive URL. --- pkgs/tools/text/colordiff/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 9b041ae4b2b..53e683561fb 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "colordiff-1.0.16"; src = fetchurl { - url = "http://www.colordiff.org/${name}.tar.gz"; + urls = [ + "http://www.colordiff.org/${name}.tar.gz" + "http://www.colordiff.org/archive/${name}.tar.gz" + ]; sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"; }; From 9c5cd4990362ca41fe294851fa850f30ab669c3c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 13 Dec 2015 01:26:38 +0100 Subject: [PATCH 439/498] cutegram: init at 2.7.0-stable --- lib/maintainers.nix | 1 + .../telegram/cutegram/default.nix | 31 ++++++++++++++++ .../libqtelegram-aseman-edition/default.nix | 34 ++++++++++++++++++ .../telegram/telegram-qml/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++ 5 files changed, 109 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 596b8a49a10..3d2144b0e31 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -239,6 +239,7 @@ pmahoney = "Patrick Mahoney "; pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; + profpatsch = "Profpatsch "; psibi = "Sibi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix new file mode 100644 index 00000000000..0a1e79365c3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub +, qt5Libs, qtbase, qtquick1, qtmultimedia, qtquickcontrols, qtgraphicaleffects, makeQtWrapper +, telegram-qml, libqtelegram-aseman-edition }: + +stdenv.mkDerivation rec { + name = "cutegram-v${version}"; + version = "2.7.0-stable"; + + src = fetchFromGitHub { + owner = "Aseman-Land"; + repo = "Cutegram"; + rev = "v${version}"; + sha256 = "0qhy30gb8zdrphz1b7zcnv8hmm5fd5qwlvrg7wpsh3hk5niz3zxk"; + }; + # TODO appindicator, for system tray plugin + buildInputs = [ qtbase qtquick1 qtmultimedia qtquickcontrols qtgraphicaleffects telegram-qml libqtelegram-aseman-edition ]; + nativeBuildInputs = [ makeQtWrapper ]; + enableParallelBuild = true; + + fixupPhase = "wrapQtProgram $out/bin/cutegram"; + + configurePhase = "qmake -r PREFIX=$out"; + + meta = with stdenv.lib; { + description = "Telegram client forked from sigram"; + homepage = "http://aseman.co/en/products/cutegram/"; + license = licenses.gpl3; + maintainer = [ maintainers.profpatsch ]; + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix new file mode 100644 index 00000000000..31e0a0dc399 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub +, qtbase, qtmultimedia, qtquick1 }: + +stdenv.mkDerivation rec { + name = "libqtelegram-aseman-edition-v${version}"; + version = "6.0"; + + src = fetchFromGitHub { + owner = "Aseman-Land"; + repo = "libqtelegram-aseman-edition"; + rev = "v${version}"; + sha256 = "17hlxf43xwic8m06q3gwbxjpvz31ks6laffjw6ny98d45zfnfwra"; + }; + + buildInputs = [ qtbase qtmultimedia qtquick1 ]; + enableParallelBuild = true; + + patchPhase = '' + substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" + substituteInPlace libqtelegram-ae.pro --replace "/\$\$LIB_PATH" "" + ''; + + configurePhase = '' + qmake -r PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "A fork of libqtelegram by Aseman, using qmake"; + homepage = src.meta.homepage; + license = stdenv.lib.licenses.gpl3; + maintainer = [ maintainers.profpatsch ]; + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix new file mode 100644 index 00000000000..709dce5e755 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, qt5Libs, qtbase, qtmultimedia, qtquick1 +, libqtelegram-aseman-edition }: + +stdenv.mkDerivation rec { + name = "telegram-qml-v${version}"; + version = "0.9.1-stable"; + + src = fetchFromGitHub { + owner = "Aseman-Land"; + repo = "TelegramQML"; + rev = "v${version}"; + sha256 = "077j06lfr6qccqv664hn0ln023xlh5cfm50kapjc2inapxj2yqmn"; + }; + + buildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; + enableParallelBuild = true; + + patchPhase = '' + substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" + substituteInPlace telegramqml.pro --replace "INSTALL_HEADERS_PREFIX/telegramqml" "INSTALL_HEADERS_PREFIX" + ''; + + configurePhase = '' + qmake -r PREFIX=$out BUILD_MODE+=lib + ''; + + meta = with stdenv.lib; { + description = "Telegram API tools for QtQml and Qml"; + homepage = src.meta.homepage; + license = stdenv.lib.licenses.gpl3; + maintainer = [ maintainers.profpatsch ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11f433b7b06..9be86ed7a77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11298,6 +11298,14 @@ let cutecom = callPackage ../tools/misc/cutecom { }; + cutegram = + let f = ../applications/networking/instant-messengers/telegram; + cp = qt5Libs.callPackage; + in cp "${f}/cutegram" rec { + libqtelegram-aseman-edition = cp "${f}/libqtelegram-aseman-edition" { }; + telegram-qml = cp "${f}/telegram-qml" { inherit libqtelegram-aseman-edition; }; + }; + cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; From 28dd9e8a6c6b86f7793e0267aab227c0bbc65b29 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Dec 2015 23:29:31 -0200 Subject: [PATCH 440/498] mgba: 0.3.0 -> 0.3.1 --- pkgs/misc/emulators/mgba/default.nix | 36 ++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 82f10688948..edf4c6a060d 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,24 +1,40 @@ -{ stdenv, fetchurl, cmake, ffmpeg, imagemagick, libzip, pkgconfig, qt5, SDL2 }: +{ stdenv, fetchurl, pkgconfig, cmake, ffmpeg, imagemagick, libzip, SDL2, qt5 }: stdenv.mkDerivation rec { - name = "mgba-0.3.0"; + name = "mgba-${meta.version}"; src = fetchurl { - url = https://github.com/mgba-emu/mgba/archive/0.3.0.tar.gz; - sha256 = "02zz6bdcwr1fx7i7dacff0s8mwp0pvabycp282qvhhx44x44q7fm"; + url = "https://github.com/mgba-emu/mgba/archive/${meta.version}.tar.gz"; + sha256 = "0z52w4dkgjjviwi6w13gls082zclljgx1sa8nlyb1xcnnrn6980l"; }; buildInputs = [ - cmake ffmpeg imagemagick libzip pkgconfig qt5.base qt5.multimedia - SDL2 + pkgconfig cmake ffmpeg imagemagick libzip SDL2 + qt5.base qt5.multimedia ]; enableParallelBuilding = true; - meta = { - homepage = https://endrist.com/mgba/; + meta = with stdenv.lib; { + version = "0.3.1"; + homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; - license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + longDescription = '' + mGBA is a new Game Boy Advance emulator written in C. + + The project started in April 2013 with the goal of being fast + enough to run on lower end hardware than other emulators + support, without sacrificing accuracy or portability. Even in + the initial version, games generally play without problems. It + is loosely based on the previous GBA.js emulator, although very + little of GBA.js can still be seen in mGBA. + + Other goals include accurate enough emulation to provide a + development environment for homebrew software, a good workflow + for tool-assist runners, and a modern feature set for emulators + that older emulators may not support. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ MP2E AndersonTorres ]; }; } From a76241c6cb3431e9517750db642760baee626187 Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Mon, 16 Nov 2015 15:40:36 -0600 Subject: [PATCH 441/498] gerbv: init at git-2015-10-07 --- .../science/electronics/gerbv/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/electronics/gerbv/default.nix diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix new file mode 100644 index 00000000000..5a86ff3e5f8 --- /dev/null +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "gerbv-${version}"; + version = "2015-10-08"; + + src = fetchgit { + url = git://git.geda-project.org/gerbv.git; + rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659"; + sha256 = "1l2x8sb1c3gq00i71fdndkqwa7148mrranayafqw9pq63869l92w"; + }; + + buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk autoreconfHook ]; + + configureFlags = ["--disable-update-desktop-database"]; + + meta = with stdenv.lib; { + description = "A Gerber (RS-274X) viewer"; + homepage = http://gerbv.geda-project.org/; + maintainers = with maintainers; [ mog ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b217170baab..22855384d94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14837,6 +14837,8 @@ let geda = callPackage ../applications/science/electronics/geda { }; + gerbv = callPackage ../applications/science/electronics/gerbv { }; + gtkwave = callPackage ../applications/science/electronics/gtkwave { }; kicad = callPackage ../applications/science/electronics/kicad { From ee8b2dc427aed12c5896c5dde6bb1428627cc56e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 16 Dec 2015 05:01:42 +0200 Subject: [PATCH 442/498] pythonPackages.azure-*: package some of the 1.* branch modules --- pkgs/top-level/python-packages.nix | 74 +++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 433fb88ee2b..fd8590e3e91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1084,7 +1084,7 @@ in modules // { md5 = "5499efd85c54c757c0e757b5407ee47f"; }; - propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; + propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests2 ]; meta = { description = "Microsoft Azure SDK for Python"; @@ -1094,6 +1094,78 @@ in modules // { }; }; + azure-nspkg = buildPythonPackage rec { + version = "1.0.0"; + name = "azure-nspkg-${version}"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/a/azure-nspkg/azure-nspkg-1.0.0.zip; + sha256 = "1xqvc8by1lbd7j9dxyly03jz3rgbmnsiqnqgydhkf4pa2mn2hgr9"; + }; + meta = { + description = "Microsoft Azure SDK for Python"; + homepage = "http://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; + }; + + azure-common = buildPythonPackage rec { + version = "1.0.0"; + name = "azure-common-${version}"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/a/azure-common/azure-common-1.0.0.zip; + sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491"; + }; + propagatedBuildInputs = with self; [ azure-nspkg ]; + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + meta = { + description = "Microsoft Azure SDK for Python"; + homepage = "http://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; + }; + + azure-storage = buildPythonPackage rec { + version = "0.20.3"; + name = "azure-storage-${version}"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/a/azure-storage/azure-storage-0.20.3.zip; + sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + }; + propagatedBuildInputs = with self; [ azure-common futures dateutil requests2 ]; + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + meta = { + description = "Microsoft Azure SDK for Python"; + homepage = "http://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; + }; + + azure-servicemanagement-legacy = buildPythonPackage rec { + version = "0.20.1"; + name = "azure-servicemanagement-legacy-${version}"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip; + sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; + }; + propagatedBuildInputs = with self; [ azure-common requests2 ]; + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + meta = { + description = "Microsoft Azure SDK for Python"; + homepage = "http://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; + }; + backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; From 99816323f9c475d8dc67af85af85ba7269c15cf7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Dec 2015 19:57:08 +0100 Subject: [PATCH 443/498] saneBackendsGit 1.0.25.{177-g753d123 -> 180-g6d8b8d5} --- pkgs/applications/graphics/sane/backends-git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 3de7057916a..66e496557a8 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -7,12 +7,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.25.177-g753d123"; + name = "sane-backends-1.0.25-180-g6d8b8d5"; src = fetchgit { url = "git://alioth.debian.org/git/sane/sane-backends.git"; - rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25"; - sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f"; + rev = "6d8b8d5aa6e8da2b24e1caa42b9ea75e9624b45d"; + sha256 = "b5b2786eef835550e4a4522db05c8c81075b1a7aff5a66f1d4a498f6efe0ef03"; }; udevSupport = hotplugSupport; From 394ef397ecc252b0d0173f28b3cc92169f686774 Mon Sep 17 00:00:00 2001 From: Mate Kovacs Date: Tue, 15 Dec 2015 21:56:03 -0800 Subject: [PATCH 444/498] pythonPackages.pyrr: 0.7.0 to 0.7.2, enable tests --- pkgs/top-level/python-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 433fb88ee2b..827107cb95b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14898,16 +14898,14 @@ in modules // { pyrr = buildPythonPackage rec { name = "pyrr-${version}"; - version = "0.7.0"; + version = "0.7.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyrr/pyrr-${version}.tar.gz"; - sha256 = "ddfcd83394e9703138a3c668747df3548a81238d8ab36d4bf6a84d25ea90b2cd"; + sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; }; - # ImportError: No module named tests - doCheck = false; - + buildInputs = with self; [ setuptools ]; propagatedBuildInputs = with self; [ multipledispatch numpy ]; meta = { From fe29df4db0405e9379fa23b0538bb95427264b8e Mon Sep 17 00:00:00 2001 From: VIZGIX Date: Tue, 15 Dec 2015 15:37:34 -0600 Subject: [PATCH 445/498] qxt: url fix updated to the correct url for downloading the libqxt tar.gz file --- pkgs/development/libraries/qxt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 98619854c1e..78dbe136672 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; src = fetchzip { - url = "http://dev.libqxt.org/libqxt/get/v${version}.tar.gz"; + url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz"; sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz"; }; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { Development Frameworks, Nokia. ''; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ forkk ]; }; } From 0944d05e2e7ea4754cff9658afdc186208ae4004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Dec 2015 11:07:08 +0100 Subject: [PATCH 446/498] libvirt-glib: add numa support --- pkgs/development/libraries/libvirt-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ae1f0e41448..39b05380472 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng +, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng + python pygobject gobjectIntrospection libcap_ng numactl ]; # Compiler flag -fstack-protector-all fixes this build error: From 98151e0691f6281965f5d54612d05822198607fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 12:05:35 +0100 Subject: [PATCH 447/498] ratox: Fix broken URL However, the URL still gives a hash mismatch. @ehmry --- .../networking/instant-messengers/ratox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 9f107559551..238b7209799 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "ratox-0.2.1"; src = fetchurl { - url = "nix-prefetch-url http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; + url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; sha256 = "1fm9b3clvnc2nf0pd1z8g08kfszwhk1ij1lyx57wl8vd51z4xsi5"; }; From 64792ffdaa753ebf35efd06bc843a8a9c90a400f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 15:17:00 +0100 Subject: [PATCH 448/498] subversion: Use callPackages --- .../version-management/subversion/default.nix | 145 +++++++++--------- pkgs/top-level/all-packages.nix | 31 ++-- 2 files changed, 93 insertions(+), 83 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f563bebd9db..050d3d72b0f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,7 +8,6 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null -, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -17,81 +16,85 @@ assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; let - config = { - "1.9".ver_min = "2"; - "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; - "1.8".ver_min = "14"; - "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; - }; -in -assert builtins.hasAttr branch config; + common = { version, sha1 }: stdenv.mkDerivation (rec { + inherit version; + name = "subversion-${version}"; -stdenv.mkDerivation (rec { + src = fetchurl { + url = "mirror://apache/subversion/${name}.tar.bz2"; + inherit sha1; + }; - version = "${branch}." + config.${branch}.ver_min; + buildInputs = [ zlib apr aprutil sqlite ] + ++ stdenv.lib.optional httpSupport serf + ++ stdenv.lib.optional pythonBindings python + ++ stdenv.lib.optional perlBindings perl + ++ stdenv.lib.optional saslSupport sasl; - name = "subversion-${version}"; + configureFlags = '' + ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} + ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} + ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} + ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} + --disable-keychain + ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} + ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} + --with-zlib=${zlib} + --with-sqlite=${sqlite} + ''; - src = fetchurl { - url = "mirror://apache/subversion/${name}.tar.bz2"; - inherit (config.${branch}) sha1; + preBuild = '' + makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + ''; + + postInstall = '' + if test -n "$pythonBindings"; then + make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + fi + + if test -n "$perlBindings"; then + make swig-pl-lib + make install-swig-pl-lib + cd subversion/bindings/swig/perl/native + perl Makefile.PL PREFIX=$out + make install + cd - + fi + + mkdir -p $out/share/bash-completion/completions + cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion + ''; + + inherit perlBindings pythonBindings; + + enableParallelBuilding = true; + + meta = { + description = "A version control system intended to be a compelling replacement for CVS in the open source community"; + homepage = http://subversion.apache.org/; + maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + + } // stdenv.lib.optionalAttrs stdenv.isDarwin { + CXX = "clang++"; + CC = "clang"; + CPP = "clang -E"; + CXXCPP = "clang++ -E"; + }); + +in { + + subversion18 = common { + version = "1.8.14"; + sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; }; - buildInputs = [ zlib apr aprutil sqlite ] - ++ stdenv.lib.optional httpSupport serf - ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ++ stdenv.lib.optional saslSupport sasl; - - configureFlags = '' - ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} - ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} - ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} - --disable-keychain - ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} - ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib} - --with-sqlite=${sqlite} - ''; - - preBuild = '' - makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) - ''; - - postInstall = '' - if test -n "$pythonBindings"; then - make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - fi - - if test -n "$perlBindings"; then - make swig-pl-lib - make install-swig-pl-lib - cd subversion/bindings/swig/perl/native - perl Makefile.PL PREFIX=$out - make install - cd - - fi - - mkdir -p $out/share/bash-completion/completions - cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - ''; - - inherit perlBindings pythonBindings; - - enableParallelBuilding = true; - - meta = { - description = "A version control system intended to be a compelling replacement for CVS in the open source community"; - homepage = http://subversion.apache.org/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + subversion19 = common { + version = "1.9.2"; + sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - CXX = "clang++"; - CC = "clang"; - CPP = "clang -E"; - CXXCPP = "clang++ -E"; -}) + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674a3ea639e..5fa7ca1ad0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13217,18 +13217,21 @@ let sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); - subversion = callPackage ../applications/version-management/subversion/default.nix { - bdbSupport = true; - httpServer = false; - httpSupport = true; - pythonBindings = false; - perlBindings = false; - javahlBindings = false; - saslSupport = false; - sasl = cyrus_sasl; - }; + inherit (callPackages ../applications/version-management/subversion/default.nix { + bdbSupport = true; + httpServer = false; + httpSupport = true; + pythonBindings = false; + perlBindings = false; + javahlBindings = false; + saslSupport = false; + sasl = cyrus_sasl; + }) + subversion18 subversion19; - subversionClient = appendToName "client" (subversion.override { + subversion = pkgs.subversion19; + + subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; @@ -14527,7 +14530,11 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; - subversionClient = subversionClient.override { branch = "1.8"; }; + subversionClient = pkgs.subversion18.override { + bdbSupport = false; + perlBindings = true; + pythonBindings = true; + }; } ../desktops/kde-4.14; From e7ae72cfb120fa1b92c45d044933b92e780ec0c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 15:18:13 +0100 Subject: [PATCH 449/498] subversion: 1.8.14 -> 1.8.15, 1.9.2 -> 1.9.3 CVE-2015-5343, CVE-2015-5259. --- .../version-management/subversion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 050d3d72b0f..219dd0babb7 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -88,13 +88,13 @@ let in { subversion18 = common { - version = "1.8.14"; - sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; + version = "1.8.15"; + sha1 = "680acf88f0db978fbbeac89ed63776d805b918ef"; }; subversion19 = common { - version = "1.9.2"; - sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + version = "1.9.3"; + sha1 = "27e8df191c92095f48314a415194ec37c682cbcf"; }; } From 493f633002e4044752a4384e765e41bd850b22ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 11:37:22 +0100 Subject: [PATCH 450/498] Die tabs die --- maintainers/scripts/copy-tarballs.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index d0b4afd8774..08a8638e25a 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -74,17 +74,17 @@ my $op = shift @ARGV; if ($op eq "--file") { my $res = 0; foreach my $fn (@ARGV) { - eval { - if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { - print STDERR "$fn is already mirrored\n"; - } else { - uploadFile($fn, basename $fn); - } - }; - if ($@) { - warn "$@\n"; - $res = 1; - } + eval { + if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { + print STDERR "$fn is already mirrored\n"; + } else { + uploadFile($fn, basename $fn); + } + }; + if ($@) { + warn "$@\n"; + $res = 1; + } } exit $res; } From 7cd3d502bb19a95bca0137e6d81f65da29ed4092 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 13:59:02 +0100 Subject: [PATCH 451/498] copy-tarballs.pl: Revive extracting all tarballs from release.nix --- maintainers/scripts/all-tarballs.nix | 18 ++++++++++++++++++ maintainers/scripts/copy-tarballs.pl | 7 ++++++- maintainers/scripts/find-tarballs.nix | 5 ++--- pkgs/top-level/make-tarball.nix | 12 ++++++++++-- pkgs/top-level/release-lib.nix | 11 +++++++++-- pkgs/top-level/release.nix | 3 ++- 6 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 maintainers/scripts/all-tarballs.nix diff --git a/maintainers/scripts/all-tarballs.nix b/maintainers/scripts/all-tarballs.nix new file mode 100644 index 00000000000..552f8802296 --- /dev/null +++ b/maintainers/scripts/all-tarballs.nix @@ -0,0 +1,18 @@ +/* Helper expression for copy-tarballs. This returns (nearly) all + tarballs used the free packages in Nixpkgs. + + Typical usage: + + $ copy-tarballs.pl --expr 'import ' +*/ + +removeAttrs (import ../../pkgs/top-level/release.nix + { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the + # dependency graph. + scrubJobs = false; + # No need to evaluate on i686. + supportedSystems = [ "x86_64-linux" ]; + }) + [ # Remove jobs whose evaluation depends on a writable Nix store. + "tarball" "unstable" + ] diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 08a8638e25a..8ce982122c3 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -93,7 +93,7 @@ elsif ($op eq "--expr") { # Evaluate find-tarballs.nix. my $expr = $ARGV[0] // die "$0: --expr requires a Nix expression\n"; - my $pid = open(JSON, "-|", "nix-instantiate", "--eval-only", "--json", "--strict", + my $pid = open(JSON, "-|", "nix-instantiate", "--eval", "--json", "--strict", "", "--arg", "expr", $expr); my $stdout = ; @@ -113,6 +113,11 @@ elsif ($op eq "--expr") { my $algo = $fetch->{type}; my $hash = $fetch->{hash}; + if (defined $ENV{DEBUG}) { + print "$url $algo $hash\n"; + next; + } + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { print STDERR "skipping $url (unsupported scheme)\n"; next; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 2dd17d9df88..e989c0e2a9e 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,10 +1,9 @@ -# This expression returns a list of all fetchurl calls used by all -# packages reachable from release.nix. +# This expression returns a list of all fetchurl calls used by ‘expr’. with import ../.. { }; with lib; -{ expr ? removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ] }: +{ expr }: let diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index fdd8fb0ef7d..c14f94d95fd 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -14,7 +14,7 @@ releaseTools.sourceTarball rec { version = builtins.readFile ../../.version; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - buildInputs = [ nix ]; + buildInputs = [ nix jq ]; configurePhase = '' eval "$preConfigure" @@ -83,7 +83,15 @@ releaseTools.sourceTarball rec { stopNest header "checking find-tarballs.nix" - nix-instantiate --eval --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null + nix-instantiate --eval --strict --show-trace --json \ + ./maintainers/scripts/find-tarballs.nix \ + --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json + nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l) + echo "found $nrUrls URLs" + if [ "$nrUrls" -lt 10000 ]; then + echo "suspiciously low number of URLs" + exit 1 + fi stopNest ''; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 15380ea43c8..2f0296223a0 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,4 +1,8 @@ -{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }: +{ supportedSystems +, packageSet ? (import ./all-packages.nix) +, allowTexliveBuilds ? false +, scrubJobs ? true +}: with import ../../lib; @@ -14,6 +18,9 @@ rec { pkgs = pkgsFor "x86_64-linux"; + hydraJob' = if scrubJobs then hydraJob else id; + + /* !!! Hack: poor man's memoisation function. Necessary to prevent Nixpkgs from being evaluated again and again for every job/platform pair. */ @@ -48,7 +55,7 @@ rec { a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ testOn = systems: f: genAttrs - (filter (x: elem x supportedSystems) systems) (system: hydraJob (f (pkgsFor system))); + (filter (x: elem x supportedSystems) systems) (system: hydraJob' (f (pkgsFor system))); /* Similar to the testOn function, but with an additional diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d0c5faf823a..c55f8f0825f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -13,9 +13,10 @@ , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] +, scrubJobs ? true }: -with import ./release-lib.nix { inherit supportedSystems; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let From d5371eb0295229a5949b795e7df59ebd2e16c67e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 14:17:33 +0100 Subject: [PATCH 452/498] copy-tarballs: Cache S3 lookups --- maintainers/scripts/copy-tarballs.pl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 8ce982122c3..0098061d0f8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 nixUnstable +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -17,6 +17,7 @@ use strict; use warnings; use File::Basename; use File::Path; +use File::Slurp; use JSON; use Net::Amazon::S3; use Nix::Store; @@ -33,9 +34,21 @@ my $s3 = Net::Amazon::S3->new( my $bucket = $s3->bucket("nixpkgs-tarballs") or die; +my $cacheFile = "/tmp/copy-tarballs-cache"; +my %cache; +$cache{$_} = 1 foreach read_file($cacheFile, err_mode => 'quiet', chomp => 1); + +END() { + write_file($cacheFile, map { "$_\n" } keys %cache); +} + sub alreadyMirrored { my ($algo, $hash) = @_; - return defined $bucket->get_key("$algo/$hash"); + my $key = "$algo/$hash"; + return 1 if defined $cache{$key}; + my $res = defined $bucket->get_key($key); + $cache{$key} = 1 if $res; + return $res; } sub uploadFile { @@ -54,6 +67,7 @@ sub uploadFile { print STDERR "uploading $fn to $mainKey...\n"; $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) or die "failed to upload $fn to $mainKey\n"; + $cache{$mainKey} = 1; # Create redirects from the other hash types. sub redirect { @@ -61,6 +75,7 @@ sub uploadFile { #print STDERR "linking $name to $dest...\n"; $bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest }) or die "failed to create redirect from $name to $dest\n"; + $cache{$name} = 1; } redirect "md5/$md5_16", $mainKey; redirect "sha1/$sha1_16", $mainKey; From 5eb2804cdbc5d288bebc534066577e7e1bff2409 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 14:28:22 +0100 Subject: [PATCH 453/498] copy-tarballs.pl: Create redirects before uploading file This makes the script more robust to interruption. --- maintainers/scripts/copy-tarballs.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 0098061d0f8..b1233827ad8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -63,12 +63,6 @@ sub uploadFile { my $mainKey = "sha512/$sha512_16"; - # Upload the file as sha512/. - print STDERR "uploading $fn to $mainKey...\n"; - $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) - or die "failed to upload $fn to $mainKey\n"; - $cache{$mainKey} = 1; - # Create redirects from the other hash types. sub redirect { my ($name, $dest) = @_; @@ -82,6 +76,12 @@ sub uploadFile { redirect "sha256/$sha256_32", $mainKey; redirect "sha256/$sha256_16", $mainKey; redirect "sha512/$sha512_32", $mainKey; + + # Upload the file as sha512/. + print STDERR "uploading $fn to $mainKey...\n"; + $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) + or die "failed to upload $fn to $mainKey\n"; + $cache{$mainKey} = 1; } my $op = shift @ARGV; From 72014cade68674d478d155234c42e6b6fb52b74f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 08:41:09 -0600 Subject: [PATCH 454/498] cutegram: fix evaluation error See discussion on #11684. --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fa7ca1ad0e..efc59b70340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11347,11 +11347,12 @@ let cutecom = callPackage ../tools/misc/cutecom { }; cutegram = - let f = ../applications/networking/instant-messengers/telegram; - cp = qt5Libs.callPackage; - in cp "${f}/cutegram" rec { - libqtelegram-aseman-edition = cp "${f}/libqtelegram-aseman-edition" { }; - telegram-qml = cp "${f}/telegram-qml" { inherit libqtelegram-aseman-edition; }; + let cp = qt5Libs.callPackage; + in cp ../applications/networking/instant-messengers/telegram/cutegram rec { + libqtelegram-aseman-edition = cp ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; + telegram-qml = cp ../applications/networking/instant-messengers/telegram/telegram-qml { + inherit libqtelegram-aseman-edition; + }; }; cvs = callPackage ../applications/version-management/cvs { }; From d8d04c8cf375048a0a516d59443fb3382fcbe7fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 16:01:53 +0100 Subject: [PATCH 455/498] firefox-esr: 38.4.0 -> 38.5.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 168223f1a7e..b7bd07d01e1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -139,8 +139,8 @@ in { firefox-esr = common { pname = "firefox-esr"; - version = "38.4.0esr"; - sha256 = "1izj0zi4dhp3957ya1nlh0mp6gyb7gvmwnlfv6q1cc3bw5y1z2h2"; + version = "38.5.0esr"; + sha256 = "086vkhrls9g0cxf50izfzcf2h60syswqrlzyi2z21awhwg7r07ra"; }; } From f8c6ced63644c7e7232a8fa2a7eabfcc86a9a8d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 16:04:36 +0100 Subject: [PATCH 456/498] nspr: 4.10.10 -> 4.11 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e1b7a01c4cd..e8d3fb3cdf2 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.10"; in +let version = "4.11"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107"; + sha256 = "cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2"; }; preConfigure = '' From af5015fa8078af7a23a78c510b1500c18ff4d009 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 09:07:59 -0600 Subject: [PATCH 457/498] kdeApps_15_12: 15.11.90 -> 15.12.0 --- pkgs/applications/kde-apps-15.12/fetchsrcs.sh | 2 +- pkgs/applications/kde-apps-15.12/srcs.nix | 1928 +++++++++-------- 2 files changed, 969 insertions(+), 961 deletions(-) diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh index 334d94a5e47..1a8c17d4ab5 100755 --- a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh +++ b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/unstable/applications/15.11.90/ -A *.tar.xz' +WGET_ARGS='http://download.kde.org/stable/applications/15.12.0/ -A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/applications/kde-apps-15.12/srcs.nix index d6eaf208b4b..a6f6c110731 100644 --- a/pkgs/applications/kde-apps-15.12/srcs.nix +++ b/pkgs/applications/kde-apps-15.12/srcs.nix @@ -3,1923 +3,1931 @@ { akonadi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/akonadi-15.11.90.tar.xz"; - sha256 = "09frr1chl0lh135lh43i8fnjjw4d06npafwnvzbd0rv0gzvl89sv"; - name = "akonadi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/akonadi-15.12.0.tar.xz"; + sha256 = "0xqas8nbqvs4bvsqi234rwsbi06h5i7a07cjmd3ggrrg9p0nk2i8"; + name = "akonadi-15.12.0.tar.xz"; }; }; akonadi-calendar = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/akonadi-calendar-15.11.90.tar.xz"; - sha256 = "0wh6f9pxl23jqgjsx0gglk4vfqy9qi9572jggqwl80j0jbzr8686"; - name = "akonadi-calendar-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/akonadi-calendar-15.12.0.tar.xz"; + sha256 = "1cxz2vrd1b96azs5pkhs6agdamqxya4xsaalfqgl3ii65gm5s6gf"; + name = "akonadi-calendar-15.12.0.tar.xz"; }; }; akonadi-search = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/akonadi-search-15.11.90.tar.xz"; - sha256 = "16l9v2g2ll5dsg2skhdgprdmk57696py6llm4i1r4hj7v2xz9k9g"; - name = "akonadi-search-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/akonadi-search-15.12.0.tar.xz"; + sha256 = "180d1591k1c6l0ky6x0clmif1fw7pwikz2pzrh9c7kzmmdrfr3xf"; + name = "akonadi-search-15.12.0.tar.xz"; }; }; analitza = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/analitza-15.11.90.tar.xz"; - sha256 = "101kbgw8rg5ic8033pch5z4fcirb1vzyqxa4rwflh9w3i5bkgy2c"; - name = "analitza-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/analitza-15.12.0.tar.xz"; + sha256 = "1z2km469f7s3mfvrgsszvffnbnihd0cbs8hp15vrd9jpsl4p7kws"; + name = "analitza-15.12.0.tar.xz"; }; }; ark = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ark-15.11.90.tar.xz"; - sha256 = "1mccm69rqzcl9zw632fgkyb248r9c9d915yyl2lv28f873m2awai"; - name = "ark-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ark-15.12.0.tar.xz"; + sha256 = "0z5xhyyhs3gl7133qpa029b4gp44nql0576wczaqjy9p3hx7r9n3"; + name = "ark-15.12.0.tar.xz"; }; }; artikulate = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/artikulate-15.11.90.tar.xz"; - sha256 = "16c6a7cm22nqnjjs1py6h031nkca7axnq1ipv14fwdwanz5mra6r"; - name = "artikulate-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/artikulate-15.12.0.tar.xz"; + sha256 = "0w9bbkznxxiriml4kqmswdn02ygassx8rq87k6bhvrbqziwgb8as"; + name = "artikulate-15.12.0.tar.xz"; }; }; audiocd-kio = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/audiocd-kio-15.11.90.tar.xz"; - sha256 = "0vkb03hc4p3h60w138xi44jsw35hji27lkm9isi544375kcimd6b"; - name = "audiocd-kio-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/audiocd-kio-15.12.0.tar.xz"; + sha256 = "016bv43b3bfyx15npps7wm1zpkrfzbiyqv48p9wd32fg5blmxnd5"; + name = "audiocd-kio-15.12.0.tar.xz"; }; }; baloo-widgets = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/baloo-widgets-15.11.90.tar.xz"; - sha256 = "168ld1376fh4q2g3fg1mc22j3bnsw5pc644lffcl1rsfkk6gnigi"; - name = "baloo-widgets-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/baloo-widgets-15.12.0.tar.xz"; + sha256 = "0lbjnwb5k5rwz4jwig7b4cm9di0b6kdr7c35ib3cy34vk2jrfzp1"; + name = "baloo-widgets-15.12.0.tar.xz"; }; }; blinken = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/blinken-15.11.90.tar.xz"; - sha256 = "1y26azmasnx9430iflwmafzyjn9z1q1fqrd2hyy42chkgfgzzf08"; - name = "blinken-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/blinken-15.12.0.tar.xz"; + sha256 = "1r7wk11gqz1zklpcqb33vkqywad356g7py5967mi21nsflz00a6c"; + name = "blinken-15.12.0.tar.xz"; }; }; bomber = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/bomber-15.11.90.tar.xz"; - sha256 = "13h65alwrnq7g7d1fhh49rixlkpyffbgxzkxdf789lc1kfpjg456"; - name = "bomber-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/bomber-15.12.0.tar.xz"; + sha256 = "1rcp2qmazzdsvxzy1zky4jp0vygpab6z9pmpzbjdpki5smkmpdv4"; + name = "bomber-15.12.0.tar.xz"; }; }; bovo = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/bovo-15.11.90.tar.xz"; - sha256 = "1yrlrdakn98vlgcrv71n5gqm9w0h7hxsdn1zz44292kklky0960f"; - name = "bovo-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/bovo-15.12.0.tar.xz"; + sha256 = "026sxcdbvpdq07miw5z107cjaclhsphr7i3w19kw7hx911chaipk"; + name = "bovo-15.12.0.tar.xz"; }; }; cantor = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/cantor-15.11.90.tar.xz"; - sha256 = "17dg35303mfz91mhgzysxifddwrlc69p9k0mhzasq64i5vmhz8pk"; - name = "cantor-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/cantor-15.12.0.tar.xz"; + sha256 = "09cyf50la3v91vqwiciq7i9c5mcjqlmq9hjrm717bcr9029abqma"; + name = "cantor-15.12.0.tar.xz"; }; }; cervisia = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/cervisia-15.11.90.tar.xz"; - sha256 = "0ksxahl6lv3lqqdvkir9b1lkqg3j3y0yfr08ac0ib5v61cb6lfgp"; - name = "cervisia-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/cervisia-15.12.0.tar.xz"; + sha256 = "1gx196x33k4nb3knrfzzksxhcy1vdcgnzx3pwqmz2w7bvsdcl1vx"; + name = "cervisia-15.12.0.tar.xz"; }; }; dolphin = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/dolphin-15.11.90.tar.xz"; - sha256 = "1w05cb1kc29f48p5spwwxx6fksd3mn6mc43n7hp8r0abkybibpgk"; - name = "dolphin-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/dolphin-15.12.0.tar.xz"; + sha256 = "19bkrwn842qygv2a0kwf76d5aqfw7wa1348x8vny2hmmbwk7laha"; + name = "dolphin-15.12.0.tar.xz"; }; }; dolphin-plugins = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/dolphin-plugins-15.11.90.tar.xz"; - sha256 = "0940mhj9v0g8b0rbkp70x6vrxk1pdhj67hv73dab63m3i2yfn4hh"; - name = "dolphin-plugins-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/dolphin-plugins-15.12.0.tar.xz"; + sha256 = "0l74z0v55qki1xnwsdzq68i4qyxb16xw2g1fhlp069c975jlmakv"; + name = "dolphin-plugins-15.12.0.tar.xz"; }; }; dragon = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/dragon-15.11.90.tar.xz"; - sha256 = "1znj06dkcgqs66z9magc2i5shrv9zvsw6lrvva3sh0pvv7mw3v76"; - name = "dragon-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/dragon-15.12.0.tar.xz"; + sha256 = "0afjl9758hb32hmiacx5bwg9paaxpxh1y4nh2r97wzb5krny3ghr"; + name = "dragon-15.12.0.tar.xz"; }; }; ffmpegthumbs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ffmpegthumbs-15.11.90.tar.xz"; - sha256 = "1q2iqk6pkv8whk82q8rvpd5dknjki0dnmg72q147pgrvi5aajrvi"; - name = "ffmpegthumbs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ffmpegthumbs-15.12.0.tar.xz"; + sha256 = "1i5sci7q4d9dflkgn8h2gsnah6snhlajydlgpknjb5l4dxdqbcg4"; + name = "ffmpegthumbs-15.12.0.tar.xz"; }; }; filelight = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/filelight-15.11.90.tar.xz"; - sha256 = "0xkrd92a26rd5s471s451dwr71rw9dyzp305h2lmg9ay6bhhjf9g"; - name = "filelight-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/filelight-15.12.0.tar.xz"; + sha256 = "0q4xwi2nbap5f4fn5ym0azk0knp053qq3ix4vbyg2mkh9r268wd6"; + name = "filelight-15.12.0.tar.xz"; }; }; gpgmepp = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/gpgmepp-15.11.90.tar.xz"; - sha256 = "1ygxa6miynlvc4ig08dqnrmwrv0jwl18yxa3v6i20xy1qjnpbw9w"; - name = "gpgmepp-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/gpgmepp-15.12.0.tar.xz"; + sha256 = "1480kx5n14ipk7sxpqpwgf2dq6jyp2b3rf7rblkis0jwqrzy61k4"; + name = "gpgmepp-15.12.0.tar.xz"; }; }; granatier = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/granatier-15.11.90.tar.xz"; - sha256 = "1vxf9qw8y1gxjs5lpjk4439qxglgdb8wx3hlygx6a71p2vg0qgdx"; - name = "granatier-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/granatier-15.12.0.tar.xz"; + sha256 = "07l4aq2qfk7blmmkpc8w6xkgj7zz6qs4vv2ifpdvkjv621475bcp"; + name = "granatier-15.12.0.tar.xz"; }; }; gwenview = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/gwenview-15.11.90.tar.xz"; - sha256 = "0n29iz2pdi848fwsz0xllylwh7mcdjrq8xwn51ysjrwf7vxc004y"; - name = "gwenview-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/gwenview-15.12.0.tar.xz"; + sha256 = "00rsw57ivicx4j9kyvx92nppxv7m2kr3p2skp5qlidpgygwig4n5"; + name = "gwenview-15.12.0.tar.xz"; }; }; jovie = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/jovie-15.11.90.tar.xz"; - sha256 = "1zvx54vch6xdsig9s2nkdxs129fvcv2lbbvy18l68q1i9wn4ksnq"; - name = "jovie-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/jovie-15.12.0.tar.xz"; + sha256 = "107ga496j0li1bqmppc96r25iq40yby63qi4hxzr6rvql0sk4vq3"; + name = "jovie-15.12.0.tar.xz"; }; }; juk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/juk-15.11.90.tar.xz"; - sha256 = "1q9pzj9j5qhi70vbkcqylfpqxiclx3j0x71axn1v5svc8wrr1hv1"; - name = "juk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/juk-15.12.0.tar.xz"; + sha256 = "0l0l72r6l2xpn7ym3zdvrpjl0qbn3jb4hdy371qn14s1gk1clai5"; + name = "juk-15.12.0.tar.xz"; }; }; kaccessible = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kaccessible-15.11.90.tar.xz"; - sha256 = "03mpqp83m8m3f4kyr55v26k64sfx8nfsn4l0wcmmi166m8kdl4c2"; - name = "kaccessible-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kaccessible-15.12.0.tar.xz"; + sha256 = "0gg90sy5a8kmllcryj7xncbyn4w6rd0f19vnn5vgsdrhgh8b8kf8"; + name = "kaccessible-15.12.0.tar.xz"; }; }; kaccounts-integration = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kaccounts-integration-15.11.90.tar.xz"; - sha256 = "192ic4f9cm3w658cbmw967jx0d0w9x8jh3j1gg18lg7yfla3hmfm"; - name = "kaccounts-integration-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kaccounts-integration-15.12.0.tar.xz"; + sha256 = "1g5rbnhl7vfhh9ni2clrkszlns9iiibdpfxgpsjfjlljr8ai8fn8"; + name = "kaccounts-integration-15.12.0.tar.xz"; }; }; kaccounts-providers = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kaccounts-providers-15.11.90.tar.xz"; - sha256 = "1sc2krffspxn3lvx7jjwdqc46j628nk5x47sjwp8wpkwmawjnpy9"; - name = "kaccounts-providers-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kaccounts-providers-15.12.0.tar.xz"; + sha256 = "12hq0rwlqz8pjnm4p0p44q4m4vj4z1r79z5pc5glv3r0rvmn05xk"; + name = "kaccounts-providers-15.12.0.tar.xz"; }; }; kajongg = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kajongg-15.11.90.tar.xz"; - sha256 = "1xyy3jfixbmbkzhb5lqhjd8yk4wlcc601ay5v6j24rngr3hnjmv9"; - name = "kajongg-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kajongg-15.12.0.tar.xz"; + sha256 = "0qbyqixvcpn5z07cwv9jzvf0dawlcsgzq776lhh49ds6hh4xgdcw"; + name = "kajongg-15.12.0.tar.xz"; }; }; kalarmcal = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kalarmcal-15.11.90.tar.xz"; - sha256 = "0dssjcdgrzxpadl5nh1v2fz4ncjf73yngjz92w4j1i6cpfkw5lrj"; - name = "kalarmcal-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kalarmcal-15.12.0.tar.xz"; + sha256 = "10lj01gsg2mr2kq39nih4cv1i48mp8b5i5s01kvaf2mwhwrj2hb5"; + name = "kalarmcal-15.12.0.tar.xz"; }; }; kalgebra = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kalgebra-15.11.90.tar.xz"; - sha256 = "1lpi4kj6vdvlh2lkxsckfz6qx868v4li8zhvqs060qxmy2w0zw58"; - name = "kalgebra-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kalgebra-15.12.0.tar.xz"; + sha256 = "11d5yzwv9p5fa9rz06gv3b773kcqmxd9hmkraz6i3ph2z2xdyfmc"; + name = "kalgebra-15.12.0.tar.xz"; }; }; kalzium = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kalzium-15.11.90.tar.xz"; - sha256 = "13grbk9y1nqh4ir9764fac3hx8gxn9bya2nxqn296x7z1wibgr4m"; - name = "kalzium-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kalzium-15.12.0.tar.xz"; + sha256 = "1p26pz900yl8ig9vh3aa1xkxap4962477rgiysckzvil1b3z9jn4"; + name = "kalzium-15.12.0.tar.xz"; }; }; kamera = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kamera-15.11.90.tar.xz"; - sha256 = "1nmsqrglaxgp7bg21x45lyplpz5bc7pqh3afkqd3p5mnmzpa38qi"; - name = "kamera-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kamera-15.12.0.tar.xz"; + sha256 = "1wa6ihbbxrdc3axj9g7ayizka2h5hv7890c8s23mrrnigf911s21"; + name = "kamera-15.12.0.tar.xz"; }; }; kanagram = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kanagram-15.11.90.tar.xz"; - sha256 = "0lyr873l68jajqhd2bairrv6f2pgfnjsx5j0hgssgl6v32c37727"; - name = "kanagram-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kanagram-15.12.0.tar.xz"; + sha256 = "03faj636jaf4r7sdp4zlkl0l4v66pdphw4yzw6lp8pg2mp6ydnjl"; + name = "kanagram-15.12.0.tar.xz"; }; }; kapman = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kapman-15.11.90.tar.xz"; - sha256 = "1hrpsn4f9k8jk1lp2cs8ykbnp3il9d495lsncrwmxycn2grd22dx"; - name = "kapman-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kapman-15.12.0.tar.xz"; + sha256 = "1m7dzspf7bg4z3v9slp6dr78gcmd6yn44mqx1ycmby85cwh5y39l"; + name = "kapman-15.12.0.tar.xz"; }; }; kapptemplate = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kapptemplate-15.11.90.tar.xz"; - sha256 = "1hiz1vas8ja0n4m0jwpbhnn6fxga4shvjrls9nhga359y2adsxid"; - name = "kapptemplate-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kapptemplate-15.12.0.tar.xz"; + sha256 = "1inzkhg6acj2z3jlj04jf46xl6p9zc671j8j8mp8r2qdr6yiy0xa"; + name = "kapptemplate-15.12.0.tar.xz"; }; }; kate = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kate-15.11.90.tar.xz"; - sha256 = "153pl21nin1v2419kj1iwgasgn7abxbi8shmg1dvd7s8p7rh4z77"; - name = "kate-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kate-15.12.0.tar.xz"; + sha256 = "0vsj28xdx58sfyxjb0x03xn3d7hbwzq9rr81jwmdp3f1np1rm5xf"; + name = "kate-15.12.0.tar.xz"; }; }; katomic = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/katomic-15.11.90.tar.xz"; - sha256 = "0aam62g97aab9prfp64r6wcw41lc4qdsr7wp4ip4z3n4pplwsg4q"; - name = "katomic-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/katomic-15.12.0.tar.xz"; + sha256 = "0sgs46bqq52sy3rym5c7d4vyf20y517iykzk3c8wndg3bkmar18s"; + name = "katomic-15.12.0.tar.xz"; }; }; kblackbox = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kblackbox-15.11.90.tar.xz"; - sha256 = "0kjfjv6955w1k8nbldaplwfjdn7nvyz6s4l1xlx1zjp8vin1gvcv"; - name = "kblackbox-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kblackbox-15.12.0.tar.xz"; + sha256 = "0lphzs5fn7n8z0c0kmfpqfqv8mcgj420254csil9gsp994873hia"; + name = "kblackbox-15.12.0.tar.xz"; }; }; kblocks = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kblocks-15.11.90.tar.xz"; - sha256 = "0z7z575z5npihq7rsigrk2043n5r857x9wcj47f86r1vf4nli0vf"; - name = "kblocks-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kblocks-15.12.0.tar.xz"; + sha256 = "1zbs48z358h35vplr32q5nhq9gp3rfmijwg2ird25mjmxwc87bi1"; + name = "kblocks-15.12.0.tar.xz"; }; }; kblog = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kblog-15.11.90.tar.xz"; - sha256 = "1lk27i7a18k30ayc4xbbzqs2sacib5zx0dq3fi0hm2axn9zi618w"; - name = "kblog-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kblog-15.12.0.tar.xz"; + sha256 = "0j6kcbzivz6ali3wyg7qyv936pvbjsf0f68xsfgci57hb4lam386"; + name = "kblog-15.12.0.tar.xz"; }; }; kbounce = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kbounce-15.11.90.tar.xz"; - sha256 = "0nqxwiiym4bq1wgcmnvik0jwxy9866gy3slygxn3bi9mzmplnw15"; - name = "kbounce-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kbounce-15.12.0.tar.xz"; + sha256 = "0jgdjj7r966j1rm6vdhbdndrbiych4z1ndx5809mpxpg9b1lr427"; + name = "kbounce-15.12.0.tar.xz"; }; }; kbreakout = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kbreakout-15.11.90.tar.xz"; - sha256 = "1lfbf65ybah5mqq0lsh2jq8wxnrr011b5pfjd8ph2cfi2140iyjp"; - name = "kbreakout-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kbreakout-15.12.0.tar.xz"; + sha256 = "1h9adxf4v0qb43avbamw73gzc3cij4i2z5z8fcznczb3gbmpp1h9"; + name = "kbreakout-15.12.0.tar.xz"; }; }; kbruch = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kbruch-15.11.90.tar.xz"; - sha256 = "10p6a8hs3p9bk209w3x47bivipmsgzklb5zsw37xwrc9icvfqysf"; - name = "kbruch-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kbruch-15.12.0.tar.xz"; + sha256 = "0sr4nx9y15hkf74m86m1ghmw1i4jcvlxhbmh3d404z64yks97hv1"; + name = "kbruch-15.12.0.tar.xz"; }; }; kcachegrind = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcachegrind-15.11.90.tar.xz"; - sha256 = "1mc8vq3xkswfrdxbihv2ai473zjc1zbqzz74agx9i0iz488x1fy8"; - name = "kcachegrind-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcachegrind-15.12.0.tar.xz"; + sha256 = "0gkafyf9980dryvv5mdgnv3fxxxfy5smpd1x8fmgjiyp8izg5nb9"; + name = "kcachegrind-15.12.0.tar.xz"; }; }; kcalc = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcalc-15.11.90.tar.xz"; - sha256 = "1cggmkydxpzija2llp4cml971z824ick3nfl03r8ap5ya65vk90i"; - name = "kcalc-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcalc-15.12.0.tar.xz"; + sha256 = "0ybs87g6axmp3yip4wip0cf9lvyf37nhywravpk3z3284dl9z6cx"; + name = "kcalc-15.12.0.tar.xz"; }; }; kcalcore = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcalcore-15.11.90.tar.xz"; - sha256 = "1sw776d8pvp33qnm9dccmc8ggxmc66qq7lsvxndkvz7hmwq5pjs8"; - name = "kcalcore-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcalcore-15.12.0.tar.xz"; + sha256 = "1zbfcbl8b7vmvzwi8969zcwb4ini3mxdc1q6n47hkmyl2rsradiq"; + name = "kcalcore-15.12.0.tar.xz"; }; }; kcalutils = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcalutils-15.11.90.tar.xz"; - sha256 = "1fy52kba0qfwdjkl2p61m31igs8g2hi11g48z6hblalx7y7g7qyf"; - name = "kcalutils-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcalutils-15.12.0.tar.xz"; + sha256 = "0ya2wgvv5vkxil6xcibrp0di6k18qfll173rw3h417ykgf11q0ir"; + name = "kcalutils-15.12.0.tar.xz"; }; }; kcharselect = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcharselect-15.11.90.tar.xz"; - sha256 = "09vwsqhh8shnylcbpm91rvsk6ijf6xnbnrb6zsbf0ymp46h43jaz"; - name = "kcharselect-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcharselect-15.12.0.tar.xz"; + sha256 = "0pllisc3p8nlzx8pgfclr28zvnwzgb3yrlbx33l09g7x0spn5whd"; + name = "kcharselect-15.12.0.tar.xz"; }; }; kcolorchooser = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcolorchooser-15.11.90.tar.xz"; - sha256 = "0vnf3fkad37s5irkg864r0cmdr9kwhsalydcji3zsxjcki0hfgdi"; - name = "kcolorchooser-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcolorchooser-15.12.0.tar.xz"; + sha256 = "0qbl18q41jhra0arfvymhxd27y7hs6bmqwzfls80l9nxa16di57c"; + name = "kcolorchooser-15.12.0.tar.xz"; }; }; kcontacts = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcontacts-15.11.90.tar.xz"; - sha256 = "16x0334hgb363266k4rf7xw8dq88pi5jcds93g8q1dyyk1qgh1bx"; - name = "kcontacts-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcontacts-15.12.0.tar.xz"; + sha256 = "1ijh9brvgqdva168a1inj8p8z837h2sg05smzxk4f56779z43cry"; + name = "kcontacts-15.12.0.tar.xz"; }; }; kcron = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kcron-15.11.90.tar.xz"; - sha256 = "0y0sv96z9y3wa151rid6r5nssbznvpv26pzcf0i2axnj8pq5z8sp"; - name = "kcron-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kcron-15.12.0.tar.xz"; + sha256 = "03b9zwa5fm8giynfz993y51cxpchi13k58afd6w4y19733scpc8w"; + name = "kcron-15.12.0.tar.xz"; }; }; kde-baseapps = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-baseapps-15.11.90.tar.xz"; - sha256 = "1zc2rh8ni8anjvirbmy1qypvcryfbxxjmlsmxr9zvkk4yjnffy8n"; - name = "kde-baseapps-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-baseapps-15.12.0.tar.xz"; + sha256 = "10l7yr9jfmzb4jh59f8mdf36bvbr7da5wacyjpgvamjzcj87l5f3"; + name = "kde-baseapps-15.12.0.tar.xz"; }; }; kdebugsettings = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdebugsettings-15.11.90.tar.xz"; - sha256 = "1qhavzgcd4i0dydajhi8qf129kdwwbd235nawy038n4lz13daj1z"; - name = "kdebugsettings-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdebugsettings-15.12.0.tar.xz"; + sha256 = "0n9l6pish25a4wg1bbibfngdzwyy5lyxyjj4aicvcx415j9yzicf"; + name = "kdebugsettings-15.12.0.tar.xz"; }; }; kde-dev-scripts = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-dev-scripts-15.11.90.tar.xz"; - sha256 = "0h5mwc6aclb2md0hifdrjqqk1h39lw2l414z0x901b49gjv9ajly"; - name = "kde-dev-scripts-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-dev-scripts-15.12.0.tar.xz"; + sha256 = "18xr7763778qmpg38avq23kaqcpyccr802wig5xy6b9dqv6jh894"; + name = "kde-dev-scripts-15.12.0.tar.xz"; }; }; kde-dev-utils = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-dev-utils-15.11.90.tar.xz"; - sha256 = "0kn1s2djs0zz530a83hq23g54xjdk3jksq9a45vgg2l2383f48m0"; - name = "kde-dev-utils-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-dev-utils-15.12.0.tar.xz"; + sha256 = "0707skcsnw5bzk7234w6jd1kwwqi010dyq4vnajxg52kmf4592j8"; + name = "kde-dev-utils-15.12.0.tar.xz"; }; }; kdeedu-data = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdeedu-data-15.11.90.tar.xz"; - sha256 = "0fnrc0dbjxiwhbi9zknqh4n5805ydd4a7vxpnyzaqdc0gvbzvq0a"; - name = "kdeedu-data-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdeedu-data-15.12.0.tar.xz"; + sha256 = "125rh8wmm5p9q6py1z25s22j1xfpn7dn1czd3l0s7diaygl28li3"; + name = "kdeedu-data-15.12.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-mobipocket-15.11.90.tar.xz"; - sha256 = "04nwsgbsysgqnjr85v4dq5rjaqys4f87vcn64rgfa6j9m6pkcx5w"; - name = "kdegraphics-mobipocket-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-mobipocket-15.12.0.tar.xz"; + sha256 = "0jqz242p20xdwhy9ncxv2njksz4ymz9xh3zvynwljq5ixw6qjayz"; + name = "kdegraphics-mobipocket-15.12.0.tar.xz"; }; }; kdegraphics-strigi-analyzer = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-strigi-analyzer-15.11.90.tar.xz"; - sha256 = "0d8c5kf0xd804irhdisdkhaxkh5qpjf37gnkklxm77i66k5x63p9"; - name = "kdegraphics-strigi-analyzer-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-strigi-analyzer-15.12.0.tar.xz"; + sha256 = "10gqbnpmzlv2rijy6yszr92aq51bsb63ypkxxpw1r9q2yzjb974b"; + name = "kdegraphics-strigi-analyzer-15.12.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdegraphics-thumbnailers-15.11.90.tar.xz"; - sha256 = "1l7n3j8qf633limppvx4gy783fyrkwq129dj46bm48j8igrpkjcl"; - name = "kdegraphics-thumbnailers-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-thumbnailers-15.12.0.tar.xz"; + sha256 = "1lns9z65596rwc9899lrkw75lq8yk4hniys4c3q114s8gvqi89i5"; + name = "kdegraphics-thumbnailers-15.12.0.tar.xz"; }; }; kde-l10n-ar = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ar-15.11.90.tar.xz"; - sha256 = "01qkrgzvrll84mfq10ahrr9c55yd63avns5fl1yn83hg047qrxj1"; - name = "kde-l10n-ar-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ar-15.12.0.tar.xz"; + sha256 = "1mhz3dylhndh3y8qxvmz41jq6rvya8l7bvd58m3lavbj1lx7n2ks"; + name = "kde-l10n-ar-15.12.0.tar.xz"; }; }; kde-l10n-bg = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-bg-15.11.90.tar.xz"; - sha256 = "1cs0c4wsb247s8df5a7rsdjiky010i6b2m6m57jj593j8lmjgj95"; - name = "kde-l10n-bg-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bg-15.12.0.tar.xz"; + sha256 = "1lnsz222jv1n3hn6ahyyshrxn33dypfdfxrfb9kqilrlqb147pv3"; + name = "kde-l10n-bg-15.12.0.tar.xz"; }; }; kde-l10n-bs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-bs-15.11.90.tar.xz"; - sha256 = "12hcr2yzd86n4kyxdbdnzxxjg637xmn1n72s0i9wdybgp385544k"; - name = "kde-l10n-bs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bs-15.12.0.tar.xz"; + sha256 = "1qb4axsj4832l0n6k2lrw50jjvc0pv6zs8g0yrnybpgyfmxa8157"; + name = "kde-l10n-bs-15.12.0.tar.xz"; }; }; kde-l10n-ca = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ca-15.11.90.tar.xz"; - sha256 = "0xxx3hic96743z38n866w6d75w66hwkc5467l7y5dxba25z1m78m"; - name = "kde-l10n-ca-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca-15.12.0.tar.xz"; + sha256 = "016kqlllv3chwnryxg72p4g9n455q1xiyy5sqncpa3gw3w65c7s7"; + name = "kde-l10n-ca-15.12.0.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-15.11.90"; + version = "ca_valencia-15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ca@valencia-15.11.90.tar.xz"; - sha256 = "05fw6vks4dm2rpa47jpds9ss57178k9vz0rgg8jfc4jdvsgs1cj6"; - name = "kde-l10n-ca_valencia-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca@valencia-15.12.0.tar.xz"; + sha256 = "1prm8lsfa9a72g9av6yl3zyjbpvfp8a6bwcqs65l98zlysb7qfma"; + name = "kde-l10n-ca_valencia-15.12.0.tar.xz"; }; }; kde-l10n-cs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-cs-15.11.90.tar.xz"; - sha256 = "1vr2c9wkvpziklbynzbam8y97c047ja7gmqkpjj1mhwd9iy1rs8p"; - name = "kde-l10n-cs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-cs-15.12.0.tar.xz"; + sha256 = "1xf1zsmw7c5rvk9557jlrm643x6wxflk3r4zg6ddgk7nxs6l1mg0"; + name = "kde-l10n-cs-15.12.0.tar.xz"; }; }; kde-l10n-da = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-da-15.11.90.tar.xz"; - sha256 = "1ihxgqlrm8z1srkkz44r43zqa38rb36d6z5c18ipp7186aiwzhcs"; - name = "kde-l10n-da-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-da-15.12.0.tar.xz"; + sha256 = "033yy4p15994lraadsmhdfmz63cmp8pds65nsrmckbicb2a748id"; + name = "kde-l10n-da-15.12.0.tar.xz"; }; }; kde-l10n-de = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-de-15.11.90.tar.xz"; - sha256 = "0wzzg9ym17q88pb4dzg6jllmpsj49wb04sskinszvpngxxf1pl2d"; - name = "kde-l10n-de-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-de-15.12.0.tar.xz"; + sha256 = "1pl0rj1i8zkra27c36bj4qh5vpgb9x71zzx3dszx8pmb0y88mp55"; + name = "kde-l10n-de-15.12.0.tar.xz"; }; }; kde-l10n-el = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-el-15.11.90.tar.xz"; - sha256 = "0sn03wvrlsci2whhwza6vq5r5mr8x66xag0kkd9jmzx76xjxrdlg"; - name = "kde-l10n-el-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-el-15.12.0.tar.xz"; + sha256 = "1mza3kg2jha0c5bm0s9146yispp6rhx8z9lf0bis60ppn3zprmdi"; + name = "kde-l10n-el-15.12.0.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-15.11.90"; + version = "en_GB-15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-en_GB-15.11.90.tar.xz"; - sha256 = "04cv9aj7my5ffqq1lnraa628c6nkc3110zmzvchhagqnb0nhi20s"; - name = "kde-l10n-en_GB-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-en_GB-15.12.0.tar.xz"; + sha256 = "07nlriiccl1zaywycg25ai92avy3k7glmxglidkkngjrkg6pfq04"; + name = "kde-l10n-en_GB-15.12.0.tar.xz"; }; }; kde-l10n-eo = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-eo-15.11.90.tar.xz"; - sha256 = "027x3hxzwa1g40zp5vwza138yyvi99a64gm568xdzvxf0h5d4dcs"; - name = "kde-l10n-eo-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eo-15.12.0.tar.xz"; + sha256 = "0rn8vp25s4lza4x6s4i72wkilf043idq6smdn2mndzvff0bcpjy1"; + name = "kde-l10n-eo-15.12.0.tar.xz"; }; }; kde-l10n-es = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-es-15.11.90.tar.xz"; - sha256 = "04vwp1wrxlgzc716kfhbfng4mvcw47zwz54p2d8gjhviskh64k5i"; - name = "kde-l10n-es-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-es-15.12.0.tar.xz"; + sha256 = "02iamhlj3j4y6j1v7dd6scz4fffq0pn494gy8nvi343y3dbyvqvc"; + name = "kde-l10n-es-15.12.0.tar.xz"; }; }; kde-l10n-et = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-et-15.11.90.tar.xz"; - sha256 = "0fg6nscjhymz7dx9szcfhlx4mkx5rbqfrk4yikm849flr86i7njr"; - name = "kde-l10n-et-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-et-15.12.0.tar.xz"; + sha256 = "1j26ig05xp45g3cbgw80kz6kzi3966wb1hk3lr4w0l80y5f4ygxg"; + name = "kde-l10n-et-15.12.0.tar.xz"; }; }; kde-l10n-eu = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-eu-15.11.90.tar.xz"; - sha256 = "0czfx3xi32ldsa57hd5ab43lgw9p1nrz9q82vd0kz35yfgspvp0y"; - name = "kde-l10n-eu-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eu-15.12.0.tar.xz"; + sha256 = "1y0lzl5y05yv21blkllipzfjcs6k1s1znz7wkk0kcmqrvmwpx1r5"; + name = "kde-l10n-eu-15.12.0.tar.xz"; }; }; kde-l10n-fa = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fa-15.11.90.tar.xz"; - sha256 = "1ci4mni45imwdaf4jbisb1c1yx9kj2j3dr7267n1fvmbpxfx55bf"; - name = "kde-l10n-fa-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fa-15.12.0.tar.xz"; + sha256 = "09axzs55bnfdjwmlyanljnlcx7zb179hkc7i2179px4iywn4fcw5"; + name = "kde-l10n-fa-15.12.0.tar.xz"; }; }; kde-l10n-fi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fi-15.11.90.tar.xz"; - sha256 = "1nwd32h0il6bd9lxlkvxk2caf7d51w2ng6nwh8j95p4h95b8pb4j"; - name = "kde-l10n-fi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fi-15.12.0.tar.xz"; + sha256 = "141ikl2q9zhawg6ib6ppdsk03vs6fwlwzlxlg7bphfxr1nc202lw"; + name = "kde-l10n-fi-15.12.0.tar.xz"; }; }; kde-l10n-fr = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-fr-15.11.90.tar.xz"; - sha256 = "0airxvji5z0g2ydgj0npn906z6r2wp3hjlmf1frjl29nwbj46wxw"; - name = "kde-l10n-fr-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fr-15.12.0.tar.xz"; + sha256 = "170ijawwvx6kqdph09w8kb9m7zzs6xya2f73an0qvvwz40aixvnn"; + name = "kde-l10n-fr-15.12.0.tar.xz"; }; }; kde-l10n-ga = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ga-15.11.90.tar.xz"; - sha256 = "184i1mskqr0f59xr8g72ph1472z66y6pq4phs31s7wxqjx90icb7"; - name = "kde-l10n-ga-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ga-15.12.0.tar.xz"; + sha256 = "1d3b3wqdn5n9lqdrf63la73hiacm95mbx0x9khc8navrcx17ybmv"; + name = "kde-l10n-ga-15.12.0.tar.xz"; }; }; kde-l10n-gl = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-gl-15.11.90.tar.xz"; - sha256 = "0lllkr65dd7s388d5khj1p6q6iymdrs3m1jmj0v0npycf613pcvf"; - name = "kde-l10n-gl-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-gl-15.12.0.tar.xz"; + sha256 = "04d74sdqgdg5rzvzg0pnk1yj4x7x0i0k6ki2npyzd9jymcasckp7"; + name = "kde-l10n-gl-15.12.0.tar.xz"; }; }; kde-l10n-he = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-he-15.11.90.tar.xz"; - sha256 = "0zdmpgxmzigwpliysjcjr80fdrywvk8as6s8ym1z5aliiqb8b78q"; - name = "kde-l10n-he-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-he-15.12.0.tar.xz"; + sha256 = "1r0j7fjg3k97dhs3q8myywm9n7cn073wy05hwv3zwc8124invgyb"; + name = "kde-l10n-he-15.12.0.tar.xz"; }; }; kde-l10n-hi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hi-15.11.90.tar.xz"; - sha256 = "0qkfhdypj41ympfqk9m6nsg868wfjf1hcc785r0fh4a32mbc6h98"; - name = "kde-l10n-hi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hi-15.12.0.tar.xz"; + sha256 = "1ki2hd2ixvyiqkldhinmidbg9gw1ivrwgynlcjx31c0aasyndbjj"; + name = "kde-l10n-hi-15.12.0.tar.xz"; }; }; kde-l10n-hr = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hr-15.11.90.tar.xz"; - sha256 = "0aq8lnibjvjc0vchy1jfadidfl31xwwrxdmd3b3c6cd2v6fyhp5k"; - name = "kde-l10n-hr-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hr-15.12.0.tar.xz"; + sha256 = "0skqv67jnwaw2zcnb73w5yfdpqagmx1bm1p6vrbh31ra8gc0v32b"; + name = "kde-l10n-hr-15.12.0.tar.xz"; }; }; kde-l10n-hu = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-hu-15.11.90.tar.xz"; - sha256 = "0y1awp3rfmxw5h595v5cv8fqswyyjg3x69b6dhmqnrsv9jh6ww3q"; - name = "kde-l10n-hu-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hu-15.12.0.tar.xz"; + sha256 = "0hm7lwajgnvqawpabbkb7i8w39xbl8dgnb8bbfxcaz9gilhzy4in"; + name = "kde-l10n-hu-15.12.0.tar.xz"; }; }; kde-l10n-ia = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ia-15.11.90.tar.xz"; - sha256 = "1c7sfm5nh6fbc7h0hia1w9wsszggdii6ssrly9pxxghnifx1ry8x"; - name = "kde-l10n-ia-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ia-15.12.0.tar.xz"; + sha256 = "0kpj2zw1id9l9i9mhjq5wxmvx204aj1yk47yyrw6yca8mlsj3mzl"; + name = "kde-l10n-ia-15.12.0.tar.xz"; }; }; kde-l10n-id = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-id-15.11.90.tar.xz"; - sha256 = "1k5ixg654v9pfzc0z5cf76kzfc4432shyw6hiq2h861zy96vlvz7"; - name = "kde-l10n-id-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-id-15.12.0.tar.xz"; + sha256 = "0xwkfa5dd1bpi345aagrbimy0jkgswjvzq1wgz4n6p3d8kazyvj0"; + name = "kde-l10n-id-15.12.0.tar.xz"; }; }; kde-l10n-is = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-is-15.11.90.tar.xz"; - sha256 = "1gsvgydqki3h1hqmmazcj66w4f5q1w539yjksw7izw64wd94sn18"; - name = "kde-l10n-is-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-is-15.12.0.tar.xz"; + sha256 = "0n9ikkni821lsk6l3wvk8nir4rjnyb3pfl9dw1ffqh1q62wn8z7c"; + name = "kde-l10n-is-15.12.0.tar.xz"; }; }; kde-l10n-it = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-it-15.11.90.tar.xz"; - sha256 = "11wdxb18wjzvv72ljzwqpbybimqg7aj3qdr1d6r2h2bmv19q5zy4"; - name = "kde-l10n-it-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-it-15.12.0.tar.xz"; + sha256 = "0h5bjm754gcls7gnzdvdcggnvbbqx0l16902bygdh3z2gyp76avy"; + name = "kde-l10n-it-15.12.0.tar.xz"; }; }; kde-l10n-ja = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ja-15.11.90.tar.xz"; - sha256 = "12mpnbrq7knkjmi3fp22qq18r0fzvii6hrgn45kyqf80s5m9cslm"; - name = "kde-l10n-ja-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ja-15.12.0.tar.xz"; + sha256 = "0ga202v7vi262khdwplkljc1hdf9y85dk0g09wb70gc0mm52zzyg"; + name = "kde-l10n-ja-15.12.0.tar.xz"; }; }; kde-l10n-kk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-kk-15.11.90.tar.xz"; - sha256 = "0qhf5a8xwyb7nxgndainzycy4r8v1xk2qqbj3hcyhy9kz7g9cb66"; - name = "kde-l10n-kk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-kk-15.12.0.tar.xz"; + sha256 = "0334ida4dhm8l6m1kqgksz68ckrfxas5b3vgnm7f4058dqvm1w6b"; + name = "kde-l10n-kk-15.12.0.tar.xz"; }; }; kde-l10n-km = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-km-15.11.90.tar.xz"; - sha256 = "1i67pmc9q4dh96zdinhby2ffgwv3q0yzl1r83n3gk70vigbqdm4x"; - name = "kde-l10n-km-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-km-15.12.0.tar.xz"; + sha256 = "18ln6h2fiwspybiripqmglrkq81z0q4llnrqz7c7gzm1jg85k8w2"; + name = "kde-l10n-km-15.12.0.tar.xz"; }; }; kde-l10n-ko = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ko-15.11.90.tar.xz"; - sha256 = "1l453c5na6n1pmls5w702zcv0vxcf3v6a6xvkjawwr58i6dzcwkx"; - name = "kde-l10n-ko-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ko-15.12.0.tar.xz"; + sha256 = "13a8iik27klxp07m798g66r5a547py2ii914pdbrx65hzgzvxn6l"; + name = "kde-l10n-ko-15.12.0.tar.xz"; }; }; kde-l10n-lt = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-lt-15.11.90.tar.xz"; - sha256 = "0kwv9hgk9v17wg1hnx5rrlxdzjjdhj4hsgvl4jps11vaxw6z5l3y"; - name = "kde-l10n-lt-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lt-15.12.0.tar.xz"; + sha256 = "1ks9ywlhxzgick1iradagc78xcnfnwmcw49d3pqdjdpw6icz1xs8"; + name = "kde-l10n-lt-15.12.0.tar.xz"; }; }; kde-l10n-lv = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-lv-15.11.90.tar.xz"; - sha256 = "0w5cq3jrjvwyzsnwj57f2n342si9xy2bggf0904yzi2kg9fy503m"; - name = "kde-l10n-lv-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lv-15.12.0.tar.xz"; + sha256 = "0l9shh6rg44qgw4lh9kp6b4rs51hn0w04dgrga0hrdm28cr1npl7"; + name = "kde-l10n-lv-15.12.0.tar.xz"; }; }; kde-l10n-mr = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-mr-15.11.90.tar.xz"; - sha256 = "1wkxz8v8y1fkzbwdmiwphfmgdgar4cbs37d32cvlql94ivwg7bm8"; - name = "kde-l10n-mr-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-mr-15.12.0.tar.xz"; + sha256 = "0liivk7bibz125hj1dcq8ilwyzhdlq7bs4adiicc26dp9r1way4c"; + name = "kde-l10n-mr-15.12.0.tar.xz"; }; }; kde-l10n-nb = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nb-15.11.90.tar.xz"; - sha256 = "05xbfc1pv8m8qdyh9c9cxzq59xrgd1amkc00nwk2sxbnwr3nw8ks"; - name = "kde-l10n-nb-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nb-15.12.0.tar.xz"; + sha256 = "1glnp3qqrhsy7vkmljqzx8ghsl1qyvmdcpdvhnjw8rdfdss5pcx2"; + name = "kde-l10n-nb-15.12.0.tar.xz"; }; }; kde-l10n-nds = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nds-15.11.90.tar.xz"; - sha256 = "00l83v501p73kbjwhhc22gxvyjd2fgyhdw41z89a1ghb0gg721pd"; - name = "kde-l10n-nds-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nds-15.12.0.tar.xz"; + sha256 = "1p1fm1jkic7gzw2n762yfq6w9laakx831mdgl3gdp0xgx7x8mg1q"; + name = "kde-l10n-nds-15.12.0.tar.xz"; }; }; kde-l10n-nl = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nl-15.11.90.tar.xz"; - sha256 = "0wdfxl5a4n0iqw9sk45pbj78rp8gb1r4y1l2abkbwr8jfmfamjn1"; - name = "kde-l10n-nl-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nl-15.12.0.tar.xz"; + sha256 = "1ki6bhw85zkgl132bf1q677r409sdvf7gfd51cj9p0fy63r87wym"; + name = "kde-l10n-nl-15.12.0.tar.xz"; }; }; kde-l10n-nn = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-nn-15.11.90.tar.xz"; - sha256 = "1wzmf0yrz5dn87xg6z8df8izvdv7fricazsy5wb81aksi24hk2n2"; - name = "kde-l10n-nn-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nn-15.12.0.tar.xz"; + sha256 = "1hrsk4kdk5w2bf0iplhpmajkrzflgxbwdks3vd2q5zrqkzx3ykgd"; + name = "kde-l10n-nn-15.12.0.tar.xz"; }; }; kde-l10n-pa = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pa-15.11.90.tar.xz"; - sha256 = "1gwphwmwg6dgmw9hak7ps1xhjkmq76cs2rbbfl5z31zjv0lhzrdm"; - name = "kde-l10n-pa-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pa-15.12.0.tar.xz"; + sha256 = "1kyqdz490ix0qm3ck2c9grqkdiqdf7aw659kvdjsh34f818ns5sq"; + name = "kde-l10n-pa-15.12.0.tar.xz"; }; }; kde-l10n-pl = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pl-15.11.90.tar.xz"; - sha256 = "1db898g2xn1i6w343axcv91aca32n0dhxh6cri6p6jq1a0rc9vbr"; - name = "kde-l10n-pl-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pl-15.12.0.tar.xz"; + sha256 = "1p3z3anik2fh9wi36ag11kyk4mfv6gjx9sgkxxdzkyd2i67jig2y"; + name = "kde-l10n-pl-15.12.0.tar.xz"; }; }; kde-l10n-pt = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pt-15.11.90.tar.xz"; - sha256 = "00x2iwd6929ry5r4a3h00rsxn7ssnmq29zsra2axl796dyqdbzds"; - name = "kde-l10n-pt-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt-15.12.0.tar.xz"; + sha256 = "04slrcs6f3bbi73l51lga42srx022x00lzlmn8m2617922kag92f"; + name = "kde-l10n-pt-15.12.0.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-15.11.90"; + version = "pt_BR-15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-pt_BR-15.11.90.tar.xz"; - sha256 = "06xnn7xdzl5lqasy2sh6a323j1ny8f8i8z8ggp4d8igwcni7rkvy"; - name = "kde-l10n-pt_BR-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt_BR-15.12.0.tar.xz"; + sha256 = "1n38d2p47bavmn248sdpb0w8k9kqxpas7rkh3dgnfwsjgd7bsb6g"; + name = "kde-l10n-pt_BR-15.12.0.tar.xz"; }; }; kde-l10n-ro = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ro-15.11.90.tar.xz"; - sha256 = "0mganx5zh51inlrz9iyk8cvp7w33qd3y1vyxw6v1aclcc91dl4ba"; - name = "kde-l10n-ro-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ro-15.12.0.tar.xz"; + sha256 = "0m9lx63d0q53c3rxmznmrsyi3kpgflg8giqgspni1pkx3injzdyv"; + name = "kde-l10n-ro-15.12.0.tar.xz"; }; }; kde-l10n-ru = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ru-15.11.90.tar.xz"; - sha256 = "0d0lz1jzrkv9ymdwadlmbqns9n521nv1cc0243hv7piwg9v02v1k"; - name = "kde-l10n-ru-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ru-15.12.0.tar.xz"; + sha256 = "0ki1cj9bngzjjqmlsi6rgbvrkxbsr53qdyfxqndbab5r76yzkjnz"; + name = "kde-l10n-ru-15.12.0.tar.xz"; }; }; kde-l10n-sk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sk-15.11.90.tar.xz"; - sha256 = "18y301b845b3zf5grcf9h4x97qc05jg7mw23j54d590x5k8ihbp6"; - name = "kde-l10n-sk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sk-15.12.0.tar.xz"; + sha256 = "1hsi3simcyc1239rjiybzv7jmcrmmc9js543s1nw9y84jn6kk78k"; + name = "kde-l10n-sk-15.12.0.tar.xz"; }; }; kde-l10n-sl = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sl-15.11.90.tar.xz"; - sha256 = "1mqqzhsr8m7y7pygzx9qyqq4hzpccrp20d42n2dgbqqwy4w10nyh"; - name = "kde-l10n-sl-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sl-15.12.0.tar.xz"; + sha256 = "0fld0lgr070w1v9830700182lslm7pmkyrxarwbf11g7a4wzsc1s"; + name = "kde-l10n-sl-15.12.0.tar.xz"; }; }; kde-l10n-sr = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sr-15.11.90.tar.xz"; - sha256 = "1rb3ivad7gskdnc9i7n6vm6a8i2davrs6b7imd06lgrcxzq56yqf"; - name = "kde-l10n-sr-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sr-15.12.0.tar.xz"; + sha256 = "028frgvzy000l38kpixyfxvcx9skwf9w2x5xl31172icwzyfvj28"; + name = "kde-l10n-sr-15.12.0.tar.xz"; }; }; kde-l10n-sv = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-sv-15.11.90.tar.xz"; - sha256 = "1xs1jjjzbihxj3ix4dbmvs329b9qhb1di2933dr41qlqm4kdnczh"; - name = "kde-l10n-sv-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sv-15.12.0.tar.xz"; + sha256 = "0i2qkz02nfcxi3s41as65d0m1bcp85j1024vyd0g746dy9d4qq8b"; + name = "kde-l10n-sv-15.12.0.tar.xz"; }; }; kde-l10n-tr = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-tr-15.11.90.tar.xz"; - sha256 = "055crwxa0fim4mpb1ghpcdjrnysqbnymc3c1yz0m3gkzy1bjlf3j"; - name = "kde-l10n-tr-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-tr-15.12.0.tar.xz"; + sha256 = "1biw08ad87l3bpg39iz42a5chdbmarp7jq9gk6zd1z76iv930may"; + name = "kde-l10n-tr-15.12.0.tar.xz"; }; }; kde-l10n-ug = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-ug-15.11.90.tar.xz"; - sha256 = "038lgvz17rnm8lx22gvisxf3r3ix80fvdvq18n8bnin3lfjqdhm7"; - name = "kde-l10n-ug-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ug-15.12.0.tar.xz"; + sha256 = "1lhmxa9k7n0za60c9l4x0k002mzgd5hyjf2y8jwh2788vd6760fq"; + name = "kde-l10n-ug-15.12.0.tar.xz"; }; }; kde-l10n-uk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-uk-15.11.90.tar.xz"; - sha256 = "0yf5nja326qrqqqn7ssli83n8llqiq244a9q5ri4khdvp0i9ni7r"; - name = "kde-l10n-uk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-uk-15.12.0.tar.xz"; + sha256 = "0mwmzf5zqda3py1xd6sk3wsz4636h0mg6mvd05raajiz7986bp30"; + name = "kde-l10n-uk-15.12.0.tar.xz"; }; }; kde-l10n-wa = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-wa-15.11.90.tar.xz"; - sha256 = "03wxmf88vjg4h9dmi7jhzzq4vzabc2pr3gvl53b78l533x0ajss4"; - name = "kde-l10n-wa-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-wa-15.12.0.tar.xz"; + sha256 = "184syr1kydbykyjprpvh1mhhi31snjadjphzapcb1d656rlw99ig"; + name = "kde-l10n-wa-15.12.0.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-15.11.90"; + version = "zh_CN-15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-zh_CN-15.11.90.tar.xz"; - sha256 = "04yzvrpykp07rnml1p9xdh32cnil9s2jrn2h7826gf29imwk4b79"; - name = "kde-l10n-zh_CN-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_CN-15.12.0.tar.xz"; + sha256 = "1jyqcaa1xbgf27bpjwjyks93zj940j4f1i7ngs5d379w2g8jp8d1"; + name = "kde-l10n-zh_CN-15.12.0.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-15.11.90"; + version = "zh_TW-15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-l10n/kde-l10n-zh_TW-15.11.90.tar.xz"; - sha256 = "0rbin45cp4iwn3pcvgks154y6jcj4qp6ah1is7l83spn5wyjw6lj"; - name = "kde-l10n-zh_TW-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_TW-15.12.0.tar.xz"; + sha256 = "0wpw1shcp2bp55smcx0xxw7g7r1rd5sm9ca9zgx979mddv8gmil3"; + name = "kde-l10n-zh_TW-15.12.0.tar.xz"; + }; + }; + kdelibs = { + version = "4.14.15"; + src = fetchurl { + url = "${mirror}/stable/applications/15.12.0/src/kdelibs-4.14.15.tar.xz"; + sha256 = "0698nbih5sgkr08rrsap64kpc3vil84hzgdyara62v0wmffdr7a7"; + name = "kdelibs-4.14.15.tar.xz"; }; }; kdenetwork-filesharing = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdenetwork-filesharing-15.11.90.tar.xz"; - sha256 = "19rkvxgkqkqrnsj0f1lh6wjm6fwsvl0n4hvfmy4wq2w669v7b1wx"; - name = "kdenetwork-filesharing-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-filesharing-15.12.0.tar.xz"; + sha256 = "03npxv2p9hy7dl6h7d1yn4f8caycgfxvgq6r8rar3lq8c170bqgj"; + name = "kdenetwork-filesharing-15.12.0.tar.xz"; }; }; kdenetwork-strigi-analyzers = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdenetwork-strigi-analyzers-15.11.90.tar.xz"; - sha256 = "11nhrfvjqfasy9xyh3phqkbi3519z3hcf4d797w9jgd6386vw32d"; - name = "kdenetwork-strigi-analyzers-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-strigi-analyzers-15.12.0.tar.xz"; + sha256 = "01axll3636r5xqzrwjwqgq8gcnm6dcbmxfr07g81wb4q479py78g"; + name = "kdenetwork-strigi-analyzers-15.12.0.tar.xz"; }; }; kdenlive = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdenlive-15.11.90.tar.xz"; - sha256 = "0cfhcd2wvski14w5zzn2vyvya5gymigp57wl54whll5f3p67x4h4"; - name = "kdenlive-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdenlive-15.12.0.tar.xz"; + sha256 = "1y7vhd0i3pw67lh20f52ngcc3japnisqgs7blf84pih7ppj4lvss"; + name = "kdenlive-15.12.0.tar.xz"; }; }; kdepim = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdepim-15.11.90.tar.xz"; - sha256 = "0iwwqmw7m06wjmx6iw2kn9ldnfz2pkvac5jvq78pmnf493v7avva"; - name = "kdepim-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdepim-15.12.0.tar.xz"; + sha256 = "0qh5iw8w3b2n1zv9c5hh0bcwrfisfk7ks0xmiqc711zc5r9a5nwh"; + name = "kdepim-15.12.0.tar.xz"; }; }; kdepimlibs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdepimlibs-15.11.90.tar.xz"; - sha256 = "0x575rqkfxfckc4rsckxiqi85mlvshqxn7pxik84iz98nrz8p73q"; - name = "kdepimlibs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdepimlibs-15.12.0.tar.xz"; + sha256 = "1zyjsq8fmrs2xy1zxcpkjz70sxx7nvnvgvxnx9q2dc4ikyqf1hqr"; + name = "kdepimlibs-15.12.0.tar.xz"; }; }; kdepim-runtime = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdepim-runtime-15.11.90.tar.xz"; - sha256 = "16ms6j9qcsd4xpc96l6ck88x805dzafz16d7zm0whwkpkghb7jb3"; - name = "kdepim-runtime-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdepim-runtime-15.12.0.tar.xz"; + sha256 = "0d9p6wvg05y54mi2aa6x6882rgk6hqr9z85iqmcd4lfsw50lp7v3"; + name = "kdepim-runtime-15.12.0.tar.xz"; }; }; kde-runtime = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kde-runtime-15.11.90.tar.xz"; - sha256 = "020gb46g8wnqypx0kxifvyfvg9vabi6cyiq4m9qg5gqixwzbfhv7"; - name = "kde-runtime-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kde-runtime-15.12.0.tar.xz"; + sha256 = "1qlqqicnysqfl32rpddklv1qhy8wqnhvchl7dm62i94w50w86am6"; + name = "kde-runtime-15.12.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-kioslaves-15.11.90.tar.xz"; - sha256 = "03m5sxagca23vb1h9s3hakn0wyr5z3wchnzsl1pnk6llbrb4s0mz"; - name = "kdesdk-kioslaves-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdesdk-kioslaves-15.12.0.tar.xz"; + sha256 = "1rgynw1zzn72sslgkxihrx4swx0sbz72a52smkjjhbykj10nlp54"; + name = "kdesdk-kioslaves-15.12.0.tar.xz"; }; }; kdesdk-strigi-analyzers = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-strigi-analyzers-15.11.90.tar.xz"; - sha256 = "1ck0mcpqm0fjyc0q46y7mwcl7p23fqi5smnllvx5f2xwzkcpp9pr"; - name = "kdesdk-strigi-analyzers-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdesdk-strigi-analyzers-15.12.0.tar.xz"; + sha256 = "0cxrrv6ry4bjhyqw8nlzin4wajqcf0rshaiq4scgb8iy5g2cpfr5"; + name = "kdesdk-strigi-analyzers-15.12.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdesdk-thumbnailers-15.11.90.tar.xz"; - sha256 = "1l8gq4hm8r6g2nr81bb2d7vyx64b64jbcawqgsg9p90g83j5zybd"; - name = "kdesdk-thumbnailers-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdesdk-thumbnailers-15.12.0.tar.xz"; + sha256 = "0w1lcvv2h4ndv91i4di9v5m6d9df5a8r93cblzm57z3izflpvf89"; + name = "kdesdk-thumbnailers-15.12.0.tar.xz"; }; }; kdewebdev = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdewebdev-15.11.90.tar.xz"; - sha256 = "0shwkqjc7r415m4zsz3cs6gks4zh9z4h83r0vjzlcmi8crnimwh7"; - name = "kdewebdev-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdewebdev-15.12.0.tar.xz"; + sha256 = "1xq0ayrnbskb0g6bmvcayfxkb6sws4vvjhv3s65im1rmsrqnrgly"; + name = "kdewebdev-15.12.0.tar.xz"; }; }; kdf = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdf-15.11.90.tar.xz"; - sha256 = "14yn33svspsrh51dmnvm5q84hhxrmfasmxpy2gg4qshba85k60mf"; - name = "kdf-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdf-15.12.0.tar.xz"; + sha256 = "0gahpl2la6xkhbkh607b3p07csja1v43i3m29q47f3gaxj4dxpln"; + name = "kdf-15.12.0.tar.xz"; }; }; kdiamond = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kdiamond-15.11.90.tar.xz"; - sha256 = "0qfs6jcdvvmffdpzqkb3r8s2i6r26w3ywcd914fwww4s8qghvhvg"; - name = "kdiamond-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kdiamond-15.12.0.tar.xz"; + sha256 = "04w7sc22cf1rvgqav2vdj1msbdggq77a8znsqgy0my2mbsqwa175"; + name = "kdiamond-15.12.0.tar.xz"; }; }; kfloppy = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kfloppy-15.11.90.tar.xz"; - sha256 = "01qwkp7d117rbxfwm2w6h2rg547c9ih6bqwxc1i1j82cggmrb7sw"; - name = "kfloppy-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kfloppy-15.12.0.tar.xz"; + sha256 = "1ihbbrrxdhgkh7nk8wmpvibxiw4a7nazw0pi88pxflbjjc4f67sn"; + name = "kfloppy-15.12.0.tar.xz"; }; }; kfourinline = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kfourinline-15.11.90.tar.xz"; - sha256 = "01lav9pgzcb8z9ranqzzf12iq0z0d5jvrn04cr927m3qnx434hqn"; - name = "kfourinline-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kfourinline-15.12.0.tar.xz"; + sha256 = "1z8y1q7ij9pc5wzfhpvy16yh6c000gwhas9kq3sjhzz9qynw9bd1"; + name = "kfourinline-15.12.0.tar.xz"; }; }; kgeography = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kgeography-15.11.90.tar.xz"; - sha256 = "0x4acd9cbhabsrz88y7iya6gnpdxh19bgkxhqyd3xj70nh1n43jh"; - name = "kgeography-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kgeography-15.12.0.tar.xz"; + sha256 = "1sj25ijc3n1xl8xmmkg784dxjcwxg4nviw89114qllbiy6q3lczh"; + name = "kgeography-15.12.0.tar.xz"; }; }; kget = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kget-15.11.90.tar.xz"; - sha256 = "0gzx0bnnp885bcx2bc0b5wp97dcazm5wx6aw0rlkrvz7vljb2jmh"; - name = "kget-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kget-15.12.0.tar.xz"; + sha256 = "0n9ah65c000x6xm04704pj6gxcgsbjfscw3gccv73vwin54y2ij5"; + name = "kget-15.12.0.tar.xz"; }; }; kgoldrunner = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kgoldrunner-15.11.90.tar.xz"; - sha256 = "1aks2ipzmkkrmmjz7bic0ggvsdgn8zd8b1sk3f8rz6z3iin8s7sh"; - name = "kgoldrunner-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kgoldrunner-15.12.0.tar.xz"; + sha256 = "0lril6s1m9frvkac531myg3jsx2xd1pp2ggnx0463hvfzgk73nd7"; + name = "kgoldrunner-15.12.0.tar.xz"; }; }; kgpg = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kgpg-15.11.90.tar.xz"; - sha256 = "0i0zkzm30gq84b1r3gpbbqksicv399al46rqqzahalcl3j5hq9kg"; - name = "kgpg-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kgpg-15.12.0.tar.xz"; + sha256 = "04y6amdjmnqg80zsrwxwixgazr3ar90a7w9mj7fiv1982xcl6wis"; + name = "kgpg-15.12.0.tar.xz"; }; }; khangman = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/khangman-15.11.90.tar.xz"; - sha256 = "0xbybx7v8pm7ff30ckfiylb6lrf0acbnwd80wy5rabplnjq56k4z"; - name = "khangman-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/khangman-15.12.0.tar.xz"; + sha256 = "1d8sf29ib1v06f4apg7g40qbf61zhgpw48pkgwxs01fdax0fahlz"; + name = "khangman-15.12.0.tar.xz"; }; }; kholidays = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kholidays-15.11.90.tar.xz"; - sha256 = "0pyd98ir6cs4abflk9lzsp847vi4wib9j970xzdp9sbi2rwqjcjh"; - name = "kholidays-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kholidays-15.12.0.tar.xz"; + sha256 = "0nclblhfjanvisn8xnis2b5y06cgk5wgqwzakywr74rffsg7nsqh"; + name = "kholidays-15.12.0.tar.xz"; }; }; kidentitymanagement = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kidentitymanagement-15.11.90.tar.xz"; - sha256 = "19qx3g25nw81fr2izzs52mih352yrf47d7shdk51ivr31ch728cb"; - name = "kidentitymanagement-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kidentitymanagement-15.12.0.tar.xz"; + sha256 = "04x01w4lvn07nybsivzh0a44cf9axxn7k8m1gdwhynqd4pjlsv4h"; + name = "kidentitymanagement-15.12.0.tar.xz"; }; }; kig = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kig-15.11.90.tar.xz"; - sha256 = "1j678j0csm1xjk1yx38ml9929q9mxq8rnwpdybxfh40ckqw62qk4"; - name = "kig-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kig-15.12.0.tar.xz"; + sha256 = "00163mm6ac3njw1farwm4rml1c9pkxp0583w10siwq7sfz28kx72"; + name = "kig-15.12.0.tar.xz"; }; }; kigo = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kigo-15.11.90.tar.xz"; - sha256 = "14dh86wwmxk3xpcvar7msx7rd6czqmm54ddr464p0i2r1vr9r1xg"; - name = "kigo-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kigo-15.12.0.tar.xz"; + sha256 = "15r298wxxl2ja6awmsvdxjrkp02hb70q097ry5vg2cmbay96drkj"; + name = "kigo-15.12.0.tar.xz"; }; }; killbots = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/killbots-15.11.90.tar.xz"; - sha256 = "1rv0m7a4v8bypzwghfzir0gnh8q3l0ql5m88q3796dms3xdsksdf"; - name = "killbots-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/killbots-15.12.0.tar.xz"; + sha256 = "1kgs427jxdg7kl7vp7a4ycf2bcpr3dcbyaimyi0c77vcsa9n3jq5"; + name = "killbots-15.12.0.tar.xz"; }; }; kimap = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kimap-15.11.90.tar.xz"; - sha256 = "1x26xxkiz6a60dh84r8fbpb99lacpwi9rvsv77wk54nm8anzwr4l"; - name = "kimap-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kimap-15.12.0.tar.xz"; + sha256 = "0xc3dki8qxwax89ic2qxc6kwxxc45fyg6lchm0j0n1b7h2z0d1km"; + name = "kimap-15.12.0.tar.xz"; }; }; kio-extras = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kio-extras-15.11.90.tar.xz"; - sha256 = "1pgvbxkx6asclbfv450x6ih9g84gwxd21gkp7s2xbya9c22445wf"; - name = "kio-extras-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kio-extras-15.12.0.tar.xz"; + sha256 = "0l697zllgd1myhabsj0sg4yrk1qlhap80r82im7lil48nzj9lh77"; + name = "kio-extras-15.12.0.tar.xz"; }; }; kiriki = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kiriki-15.11.90.tar.xz"; - sha256 = "0v9d2gkgk3ad8p40k5qdczxypqziaghr7fxq54cs2cpf2mkir95b"; - name = "kiriki-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kiriki-15.12.0.tar.xz"; + sha256 = "0xfg70wd93hqzlvdaarv2nni35641gyp9in9k0fr17q7h8znpmak"; + name = "kiriki-15.12.0.tar.xz"; }; }; kiten = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kiten-15.11.90.tar.xz"; - sha256 = "0xmcga41bcg5map804jqaag4z7w4i1dffy7pn3hx7hyqyk0wdad7"; - name = "kiten-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kiten-15.12.0.tar.xz"; + sha256 = "194f85p7kg0z2jd5r229nawzqi091c4giwms99hf0dj9sl0mga3r"; + name = "kiten-15.12.0.tar.xz"; }; }; kjumpingcube = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kjumpingcube-15.11.90.tar.xz"; - sha256 = "052ig7xf5q3f0cwn9khh9pm51n527iv4659nphg81hl2cx7cxn21"; - name = "kjumpingcube-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kjumpingcube-15.12.0.tar.xz"; + sha256 = "0zhl528h38x64r1mq0bjmh67487np3izcfij6d1w603mabhp146n"; + name = "kjumpingcube-15.12.0.tar.xz"; }; }; kldap = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kldap-15.11.90.tar.xz"; - sha256 = "1rqgypkk0l1f8wc3wkd5bwpifpgd9411lkqw9qv748jvnxwyz4hm"; - name = "kldap-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kldap-15.12.0.tar.xz"; + sha256 = "110pfp650w2ll02xcc0wb7d0fj3bp88k4l1mnyad0xw9acsd2l8r"; + name = "kldap-15.12.0.tar.xz"; }; }; klettres = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/klettres-15.11.90.tar.xz"; - sha256 = "01qkhnbjqlr8zvr4w835kvgxn5vnnrvb1g2c4cvbnj6093p583h7"; - name = "klettres-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/klettres-15.12.0.tar.xz"; + sha256 = "016hnl7pihikanapn79qj49q5fc3pgx7pdmqhs8v6kqic20wgrj1"; + name = "klettres-15.12.0.tar.xz"; }; }; klickety = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/klickety-15.11.90.tar.xz"; - sha256 = "0apl56jcvjk67qy05nyn0mq9pakj6vqfw9k1sgzpcx1nppzn0whp"; - name = "klickety-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/klickety-15.12.0.tar.xz"; + sha256 = "092x764bflnwjlmw4mdzpi4q6i206axy711h3fibkdlmnir7yj9w"; + name = "klickety-15.12.0.tar.xz"; }; }; klines = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/klines-15.11.90.tar.xz"; - sha256 = "07dbf0dwabwd6hckbgdxj2a5wfv5ikc6slmf907ba7v82bhkhxas"; - name = "klines-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/klines-15.12.0.tar.xz"; + sha256 = "0qs93fl1snsycbzy074xx96p5s29fjs8qwz84jz2qh1p7jb0kdn1"; + name = "klines-15.12.0.tar.xz"; }; }; kmag = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmag-15.11.90.tar.xz"; - sha256 = "07ysgxjahs8r2cni0fy9sidig2sm980rrihl12g75n1v9v10km7y"; - name = "kmag-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmag-15.12.0.tar.xz"; + sha256 = "1bx65bz7j4ab3zmc4sl6j9hdp7bmr3287ly66n3bidyc9rn25w02"; + name = "kmag-15.12.0.tar.xz"; }; }; kmahjongg = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmahjongg-15.11.90.tar.xz"; - sha256 = "18g4ng4a5qf49cb54zbijcywkwazncqcqlq3148h0iib5q24ghpq"; - name = "kmahjongg-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmahjongg-15.12.0.tar.xz"; + sha256 = "1m56qq98f344g9snnpfg1z26xnca6zr6av29i4fnx4p33hcbg9rx"; + name = "kmahjongg-15.12.0.tar.xz"; }; }; kmailtransport = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmailtransport-15.11.90.tar.xz"; - sha256 = "012ghx7hw6b72zpbgac4cak8azv12i556bvhywkhsw539zk4psqp"; - name = "kmailtransport-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmailtransport-15.12.0.tar.xz"; + sha256 = "1v20v0cy34cpp559zcn5cbbqv6gxy60msmyar5dlyx2xxi7jrzrc"; + name = "kmailtransport-15.12.0.tar.xz"; }; }; kmbox = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmbox-15.11.90.tar.xz"; - sha256 = "13v3awx4qxdr7vnl1ngm9gs8n9jsk1rqg7fqhlj7daa4h4nvjzas"; - name = "kmbox-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmbox-15.12.0.tar.xz"; + sha256 = "0kygxv69zcsf3zjdlnxcxbnbv2zdsx8n4z2ai4smdkwm3gp15h34"; + name = "kmbox-15.12.0.tar.xz"; }; }; kmime = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmime-15.11.90.tar.xz"; - sha256 = "0yn8x4zi5ra8ykcncy85s764skwcimskhs96jc8qzm8bcdd9pzpf"; - name = "kmime-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmime-15.12.0.tar.xz"; + sha256 = "1gzir5bz2rbd24hwr9v7k6ri86ga5c7l1xgyr15pzdpa4q5nr975"; + name = "kmime-15.12.0.tar.xz"; }; }; kmines = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmines-15.11.90.tar.xz"; - sha256 = "1lyjpzfjz6pl1s38xj4186jpl29lvi063fvcmhi9dfny2nkmfa15"; - name = "kmines-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmines-15.12.0.tar.xz"; + sha256 = "07pn7k9ls8h8xc4wap3zgrz2z0x4yf9krmb8qgjk7k5basr6bcmy"; + name = "kmines-15.12.0.tar.xz"; }; }; kmix = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmix-15.11.90.tar.xz"; - sha256 = "0gc0139xxw5rm00x8kqyqgkyr4yr48gb17a7x9hxf7qlwydjvvav"; - name = "kmix-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmix-15.12.0.tar.xz"; + sha256 = "0cfs6xgj1yqv5ig8hx2m43a1yzjmbxkqhwj4gfpzl1anmhywmqz0"; + name = "kmix-15.12.0.tar.xz"; }; }; kmousetool = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmousetool-15.11.90.tar.xz"; - sha256 = "1dw7cnd40y1rigv033b6d6q140f56hd9cg1lsv3lg52pgfmdpa3n"; - name = "kmousetool-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmousetool-15.12.0.tar.xz"; + sha256 = "08mbjbf4i9xfadblwrviq9l3hfc2l0zpfhv1v6a1piz1cijr3zlz"; + name = "kmousetool-15.12.0.tar.xz"; }; }; kmouth = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmouth-15.11.90.tar.xz"; - sha256 = "14xbxdrpyc12lgx0l66vfxicz5zy69g0dgljakvd10qhbk5bv7cd"; - name = "kmouth-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmouth-15.12.0.tar.xz"; + sha256 = "1hxy6hk40s4kasv5qwhjhsq5k6lf2cfvvkwmh46rc3z7g6q02i10"; + name = "kmouth-15.12.0.tar.xz"; }; }; kmplot = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kmplot-15.11.90.tar.xz"; - sha256 = "1dacdvcjkipbk30k3ad4slq50nlik57wg7pc9fj4dbkb22fkwq5q"; - name = "kmplot-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kmplot-15.12.0.tar.xz"; + sha256 = "0fs5zvpfb8plpijsibqygcqhwxx9h2aqjkcfha7lpi6wscb33j21"; + name = "kmplot-15.12.0.tar.xz"; }; }; knavalbattle = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/knavalbattle-15.11.90.tar.xz"; - sha256 = "0rq5whawhc806kcn0lbssscfkgy8khw9bwxybkb9wl0ps6p3za65"; - name = "knavalbattle-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/knavalbattle-15.12.0.tar.xz"; + sha256 = "18idqx5nrfp3fwb1xjk1l4pf5wak1pmym87xvnwg4xbiv26gv6v9"; + name = "knavalbattle-15.12.0.tar.xz"; }; }; knetwalk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/knetwalk-15.11.90.tar.xz"; - sha256 = "0kp30yjpq84vzj8d4j1f9vzdh6j5rfg2kkzcxzy7xn6a56318c40"; - name = "knetwalk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/knetwalk-15.12.0.tar.xz"; + sha256 = "1h7bqh83ykjhmv6xfn2wkq6ki7p1zpf7q18rypbchlkl8qm2q992"; + name = "knetwalk-15.12.0.tar.xz"; }; }; kolf = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kolf-15.11.90.tar.xz"; - sha256 = "144cmzkw7dx4ylacmig5828346yyi0kcgn7058qpf9r42v4h06wi"; - name = "kolf-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kolf-15.12.0.tar.xz"; + sha256 = "0xbxvd1zwsqxsdnidizp83fydz42700bh9zp8wr4kymf6rjr43g4"; + name = "kolf-15.12.0.tar.xz"; }; }; kollision = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kollision-15.11.90.tar.xz"; - sha256 = "10qparglgiqfbqfvs0r1272q0l8xcscpmv5d883ciss6d4ivw3mw"; - name = "kollision-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kollision-15.12.0.tar.xz"; + sha256 = "1d4msxppm4f01dmi5lmivx7rzn070clg1gcxknf05i2kdkrfsal0"; + name = "kollision-15.12.0.tar.xz"; }; }; kolourpaint = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kolourpaint-15.11.90.tar.xz"; - sha256 = "0s7r2q97y3f7gdxpff0k1mlscgxz8d1jifpfvs728mwhn821vb3d"; - name = "kolourpaint-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kolourpaint-15.12.0.tar.xz"; + sha256 = "0931r80xdwxbqja59qrr9rsmkksyr2dimak2b757klsbnmpyb9kv"; + name = "kolourpaint-15.12.0.tar.xz"; }; }; kompare = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kompare-15.11.90.tar.xz"; - sha256 = "1f1xs97b6llgi27gv6gd1zcv8bxkw1n46bl2rd0363n789ipdpx8"; - name = "kompare-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kompare-15.12.0.tar.xz"; + sha256 = "1cvigjqzzf7jinw69nxhx7n87wv6wf1rchfb0mcq86bhjfc8f5fi"; + name = "kompare-15.12.0.tar.xz"; }; }; konquest = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/konquest-15.11.90.tar.xz"; - sha256 = "0f3hqk7lf1h7wbc4qvn6j662qw1g6vmrbr2995rar37bzr2x7g20"; - name = "konquest-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/konquest-15.12.0.tar.xz"; + sha256 = "1c87d6xjp2dz1s0r6pa7vcn5waw2m21i5z7r3mlcaj0gk4s8wmgj"; + name = "konquest-15.12.0.tar.xz"; }; }; konsole = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/konsole-15.11.90.tar.xz"; - sha256 = "1xh5sw0qdffxs7rbxpai25p4ri7pf6n69c9f9d6zkrpwqrnbnyvn"; - name = "konsole-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/konsole-15.12.0.tar.xz"; + sha256 = "1mabhr3pm59558592gjkp6h1hsrna582lixy6rranrzh6mk9rswh"; + name = "konsole-15.12.0.tar.xz"; }; }; kontactinterface = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kontactinterface-15.11.90.tar.xz"; - sha256 = "10lzs4pwcqhd58mpgiayi0z24x03z21fz1k56di37c40p829v50m"; - name = "kontactinterface-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kontactinterface-15.12.0.tar.xz"; + sha256 = "0n934mrm8kn1b8kqf51xv9ax0b7jfi9729rvnjr0mblpj506bnzq"; + name = "kontactinterface-15.12.0.tar.xz"; }; }; kopete = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kopete-15.11.90.tar.xz"; - sha256 = "0f8xazwhvi7jarx4rnlw9sggvdy9a02577919f5prvm7cp29k0g8"; - name = "kopete-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kopete-15.12.0.tar.xz"; + sha256 = "0c3cydhaa20mcz2g8d3gcsrclfzsfwd6cqajsvh7ns5xjvkkw4g0"; + name = "kopete-15.12.0.tar.xz"; }; }; kpat = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kpat-15.11.90.tar.xz"; - sha256 = "09fpnss71xg62crm6vw6iw16p7z6x8d39jn8ydwzp9dqw351x0dq"; - name = "kpat-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kpat-15.12.0.tar.xz"; + sha256 = "0nqv8pmarj0lf50f6szn20j05i2c238hk2nvslbazsqjyqcadm5s"; + name = "kpat-15.12.0.tar.xz"; }; }; kpimtextedit = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kpimtextedit-15.11.90.tar.xz"; - sha256 = "06zicz9d0807vmqyryv19wmgnw2w2nvfrsp7ca74mzybi9j18rvh"; - name = "kpimtextedit-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kpimtextedit-15.12.0.tar.xz"; + sha256 = "1gvnnfkwj3qayb500xhja1x467j3qrj9bgcjvkdrwbgg3s82pias"; + name = "kpimtextedit-15.12.0.tar.xz"; }; }; kppp = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kppp-15.11.90.tar.xz"; - sha256 = "1q332n00fak1jz3ksn1fnyvyi9mz80h9ylzgn8r9mr7v7lpz5x3r"; - name = "kppp-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kppp-15.12.0.tar.xz"; + sha256 = "07x1603sfgxjd51dwrdwd1gwwypklbzib9wxi8r6d24f1mgiv9c1"; + name = "kppp-15.12.0.tar.xz"; }; }; kqtquickcharts = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kqtquickcharts-15.11.90.tar.xz"; - sha256 = "1slyjj7np7k70ddrnw6clqzpwfdci722vsgxzwsripgwcdk7915x"; - name = "kqtquickcharts-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kqtquickcharts-15.12.0.tar.xz"; + sha256 = "1rp1kg8mm5p9h4h8n9js5l0xvvhiqbca2hbaywckr1ckwwiy16is"; + name = "kqtquickcharts-15.12.0.tar.xz"; }; }; krdc = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/krdc-15.11.90.tar.xz"; - sha256 = "0qsm3m8ry07lkqkbbk5wy2b7vnaamdmgqvcbv193fnj2w62gcfmi"; - name = "krdc-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/krdc-15.12.0.tar.xz"; + sha256 = "00q8lddqabbkb5lscsxq7sqny07zi1l449vhrahjxygqjivzrif8"; + name = "krdc-15.12.0.tar.xz"; }; }; kremotecontrol = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kremotecontrol-15.11.90.tar.xz"; - sha256 = "0kapm1kmr4pwy4qaz4rsh22rji4w9nz2a79gmzcdkq51srs6iv7f"; - name = "kremotecontrol-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kremotecontrol-15.12.0.tar.xz"; + sha256 = "1vlzrc9p4icw4rniwhnjqw75h7r43n70rbbjmlir2py7cxybgmip"; + name = "kremotecontrol-15.12.0.tar.xz"; }; }; kreversi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kreversi-15.11.90.tar.xz"; - sha256 = "0swmh832irdg1dxdy0kvvn2ph4ic9yis15v3bf95rl0vbhz3892w"; - name = "kreversi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kreversi-15.12.0.tar.xz"; + sha256 = "09zbbvpllx4q2q1x0c5m1924a7vf8m0x55qb670fnx9cgybygvdm"; + name = "kreversi-15.12.0.tar.xz"; }; }; krfb = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/krfb-15.11.90.tar.xz"; - sha256 = "17rj7hgqm0w5s05g35mnsjdp12vxmrx1kzg4iiwa4x74fhhahgcd"; - name = "krfb-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/krfb-15.12.0.tar.xz"; + sha256 = "1zi84gzy7k7rvn9z5anphgqjnv19sb4kls2gw483isc6dp5xlrm7"; + name = "krfb-15.12.0.tar.xz"; }; }; kross-interpreters = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kross-interpreters-15.11.90.tar.xz"; - sha256 = "0wbbfxfa7i8brrpah2a3w01jljwlfpznbw1biayq4m2wh4s1zfbc"; - name = "kross-interpreters-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kross-interpreters-15.12.0.tar.xz"; + sha256 = "0ycs9agc872l1kcbcbhibyyv8xznww8qazh5z2db1w3c0380g4hv"; + name = "kross-interpreters-15.12.0.tar.xz"; }; }; kruler = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kruler-15.11.90.tar.xz"; - sha256 = "1frrinlkc9pp7y99jf5xlrzphh00i68jdxpgkqjfmsdf1ifm3xp1"; - name = "kruler-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kruler-15.12.0.tar.xz"; + sha256 = "1gzbsl6xw5x5kcf52gal8f07rxz2xilr541j14isp5qnl1qlym6p"; + name = "kruler-15.12.0.tar.xz"; }; }; ksaneplugin = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksaneplugin-15.11.90.tar.xz"; - sha256 = "1vkbbpack87rg20ab4byp8hgwgi7dws375lk6pkx29gq091blnby"; - name = "ksaneplugin-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksaneplugin-15.12.0.tar.xz"; + sha256 = "1zwdxa91j6yh5607aawg1jcn02fnp17ydf2q0fzq5211b0ly6hvf"; + name = "ksaneplugin-15.12.0.tar.xz"; }; }; kscd = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kscd-15.11.90.tar.xz"; - sha256 = "1c7rq1p7n2p15yl21x9pmd80w3b7zl4k839jw8i02aidllbkm252"; - name = "kscd-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kscd-15.12.0.tar.xz"; + sha256 = "1x0pw2cbkm4x9phb0j4ac9kc5w6ikvhz2a4bf5p1asidpcd0vfw0"; + name = "kscd-15.12.0.tar.xz"; }; }; kshisen = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kshisen-15.11.90.tar.xz"; - sha256 = "0hl0xbf6s44rjwk34kvm4l2i91w4yd60pcxc7hqc9aq5mwmdxwqn"; - name = "kshisen-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kshisen-15.12.0.tar.xz"; + sha256 = "1azqrg8268557wa7y4l4z667pvgk40nzn9cq5h7i2s6spqbirj1a"; + name = "kshisen-15.12.0.tar.xz"; }; }; ksirk = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksirk-15.11.90.tar.xz"; - sha256 = "0wpjwp5p9hna0n3dp5x0pjx18pq16vvhmq84sbar7qm289v5j6si"; - name = "ksirk-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksirk-15.12.0.tar.xz"; + sha256 = "04pyppz7pnj8ivlv2aqdjawcjlgbra7zxdsmbb1f7x1il0hdwwhy"; + name = "ksirk-15.12.0.tar.xz"; }; }; ksnakeduel = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksnakeduel-15.11.90.tar.xz"; - sha256 = "020sm6vff3zx36cx8h24y51a8r68h2h354j4p33wanmj8w3lsjdy"; - name = "ksnakeduel-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksnakeduel-15.12.0.tar.xz"; + sha256 = "1pmk7v8djcq3jkw77g074xi5j7sds6nn0y87vxl7fpldn7xj1msh"; + name = "ksnakeduel-15.12.0.tar.xz"; }; }; kspaceduel = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kspaceduel-15.11.90.tar.xz"; - sha256 = "0hs4yxp3zhxhrlq3wrl0kgiamwlamyyd70h5xpqcvl8kfqavggik"; - name = "kspaceduel-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kspaceduel-15.12.0.tar.xz"; + sha256 = "14z3wgzjdc28a4rkv99r9m4am9qprnf3m8sgdgjcvq478308z2qc"; + name = "kspaceduel-15.12.0.tar.xz"; }; }; ksquares = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksquares-15.11.90.tar.xz"; - sha256 = "0zqb0xlmp3k9s0i6iyd55dp99z2vglnjnwib49vrkh0rmbq3xcn9"; - name = "ksquares-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksquares-15.12.0.tar.xz"; + sha256 = "1w5z1j99gjizzd3zdym9q6frjfybyk4zjhvv8r788562j3qm1iiz"; + name = "ksquares-15.12.0.tar.xz"; }; }; kstars = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kstars-15.11.90.tar.xz"; - sha256 = "0c5fx1z83plfkimnh7ykfq8a0zvivfbpw6j2m4ssi0bxlan9kphd"; - name = "kstars-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kstars-15.12.0.tar.xz"; + sha256 = "1qf0ir0s3bw7dxv74w88y4165s87ah8hi1ivwi4391wm1qkijm00"; + name = "kstars-15.12.0.tar.xz"; }; }; ksudoku = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksudoku-15.11.90.tar.xz"; - sha256 = "0qf7ia9pq6pv2hpwx4zs21w6bx38c9kman6i7qrbs09fd6chndf9"; - name = "ksudoku-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksudoku-15.12.0.tar.xz"; + sha256 = "14m8alqgyc8lc4jmca3lfgw4lhigj7xy7ibyilc7d5ql9fwl8aqm"; + name = "ksudoku-15.12.0.tar.xz"; }; }; ksystemlog = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ksystemlog-15.11.90.tar.xz"; - sha256 = "1flpy7sssbl5mn0gzpx2053wncylj6ak89jx6gsldq16w5yf7qhr"; - name = "ksystemlog-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ksystemlog-15.12.0.tar.xz"; + sha256 = "1gqarafcn6j0ingkdn5mnwcv3y7rw6i564dmwjsncn3jsk4217v2"; + name = "ksystemlog-15.12.0.tar.xz"; }; }; kteatime = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kteatime-15.11.90.tar.xz"; - sha256 = "07zpjx4nilp3ldnbh9rx8y70xdpbjfhrdc2drg87z2ywrf8kmv64"; - name = "kteatime-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kteatime-15.12.0.tar.xz"; + sha256 = "089gpi9gd0gk5pmikziz8jgzjvm2n60bmiyv13w955dsldqr04bv"; + name = "kteatime-15.12.0.tar.xz"; }; }; ktimer = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktimer-15.11.90.tar.xz"; - sha256 = "0xgkan0a4gz37vqby8hjra0jylma8l586dr38gf8blm8vc4qw58g"; - name = "ktimer-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktimer-15.12.0.tar.xz"; + sha256 = "1zjv9nqx8ij66r2ig7ran9wzlffiw13kyjili4mxyvlg1gq2piwc"; + name = "ktimer-15.12.0.tar.xz"; }; }; ktnef = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktnef-15.11.90.tar.xz"; - sha256 = "136hb86lp4qd9kzm63876gf9wllqh6mkciqq9lflrc1f4csy3h3l"; - name = "ktnef-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktnef-15.12.0.tar.xz"; + sha256 = "15qyvyqww4fhhwb6ms0wakvs7lxi7pgljyjw9vxc73ppmn3i69ps"; + name = "ktnef-15.12.0.tar.xz"; }; }; ktouch = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktouch-15.11.90.tar.xz"; - sha256 = "0fa2zlk1546xgv5q9nbcymfpizrppllla1yhm46fh1rrhxv8spaw"; - name = "ktouch-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktouch-15.12.0.tar.xz"; + sha256 = "1yh9jdl45vq99ra9lp759c6gh4zs8s9nnb58f3kbhhqn8sphw4qx"; + name = "ktouch-15.12.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-accounts-kcm-15.11.90.tar.xz"; - sha256 = "1gcj320221h7b3c20vcpbgqpgw61zfw3zf9ryl1b3cxdfnvqnzzl"; - name = "ktp-accounts-kcm-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-accounts-kcm-15.12.0.tar.xz"; + sha256 = "1az0048wzq1kx2c4si4k2470mpskcan904l4biqflqsdy2zfg7rj"; + name = "ktp-accounts-kcm-15.12.0.tar.xz"; }; }; ktp-approver = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-approver-15.11.90.tar.xz"; - sha256 = "1gi72mj8p9rq051hdj574mr51445nzl3wpcb2az145igbdyh97d4"; - name = "ktp-approver-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-approver-15.12.0.tar.xz"; + sha256 = "0gcyvkrpj91hvyzvgk4anj51xni6xzp9vb6cb6afp2g72nvhzqsm"; + name = "ktp-approver-15.12.0.tar.xz"; }; }; ktp-auth-handler = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-auth-handler-15.11.90.tar.xz"; - sha256 = "042p5s416a4208wksvqzhh2cwxncgh0vljp45i2isy7bcxdcqnan"; - name = "ktp-auth-handler-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-auth-handler-15.12.0.tar.xz"; + sha256 = "00ipr6936j0iwdy9c6r1x57was9f7g17sh5r5nb1fgdk0rfvnpm4"; + name = "ktp-auth-handler-15.12.0.tar.xz"; }; }; ktp-common-internals = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-common-internals-15.11.90.tar.xz"; - sha256 = "0lxd4brfv1ib9y9pgs5dig18pmsqpj9php785xj2n3lpqjjmyw9z"; - name = "ktp-common-internals-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-common-internals-15.12.0.tar.xz"; + sha256 = "11ad84y8x4nac9f5bqzwhmwjigdx69z2zfiwfjzxv6fjkf02gz2m"; + name = "ktp-common-internals-15.12.0.tar.xz"; }; }; ktp-contact-list = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-contact-list-15.11.90.tar.xz"; - sha256 = "1x40rx4xhcznhhhb0lmr860hdspr0jj5kjd8kl9si2rb8355ddpq"; - name = "ktp-contact-list-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-list-15.12.0.tar.xz"; + sha256 = "0l1k1spnsf8s3h6ivamihl3bfwhy5y4f0jv44nr2qlk370ip404c"; + name = "ktp-contact-list-15.12.0.tar.xz"; }; }; ktp-contact-runner = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-contact-runner-15.11.90.tar.xz"; - sha256 = "0fshmq6m3w3srwzy42p4sxl6ha94950b4mz7jv9gijr6z9gjm4hf"; - name = "ktp-contact-runner-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-runner-15.12.0.tar.xz"; + sha256 = "17vkp9idmywbrxjlrmaxkhv75iv1nqfqvmgisxdi1rv224rayif3"; + name = "ktp-contact-runner-15.12.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-desktop-applets-15.11.90.tar.xz"; - sha256 = "1nn1kmx6dxcpfra98d9nk9y942s0jcivl35fx4r1wwa33ky33sch"; - name = "ktp-desktop-applets-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-desktop-applets-15.12.0.tar.xz"; + sha256 = "01pnr2nvlz1hg4s6w1xlxi42k1m53k0zlzzjjw0hzpjyjvvqybpw"; + name = "ktp-desktop-applets-15.12.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-filetransfer-handler-15.11.90.tar.xz"; - sha256 = "0mq5s3fwb865jd0a6yw0cvipbia2bnhqs1h9ybsxs03q9ywwdfnk"; - name = "ktp-filetransfer-handler-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-filetransfer-handler-15.12.0.tar.xz"; + sha256 = "0hq1jws3fknl0xsy4j4i72af0s700l065ikfcjlmqfkmr9kvgf3j"; + name = "ktp-filetransfer-handler-15.12.0.tar.xz"; }; }; ktp-kded-module = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-kded-module-15.11.90.tar.xz"; - sha256 = "1mrrx8kl5i7gcb21mqy18iycz34hdzlg236hgk3pbv7ykwrwxibq"; - name = "ktp-kded-module-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-kded-module-15.12.0.tar.xz"; + sha256 = "0cmgcfg3aw9dqjf6x0vb040mji4wfp8fxrs89916hhh7icavcab7"; + name = "ktp-kded-module-15.12.0.tar.xz"; }; }; ktp-send-file = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-send-file-15.11.90.tar.xz"; - sha256 = "0kfh389zwp8ckkjcs24ffzmxhzxb73jdpcjd9iyb0xzrhc2n8gpl"; - name = "ktp-send-file-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-send-file-15.12.0.tar.xz"; + sha256 = "1rasdrdydv5mmq2nkgb5nflklid02pbwb2kff6dfkz45xbsjirqa"; + name = "ktp-send-file-15.12.0.tar.xz"; }; }; ktp-text-ui = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktp-text-ui-15.11.90.tar.xz"; - sha256 = "1jx9s356z2yrz9ir6xhf7qyllnr2yqby9cpchsb5fkhy4g4dfs6j"; - name = "ktp-text-ui-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktp-text-ui-15.12.0.tar.xz"; + sha256 = "1hzsgl9rcvqsadvaksiqg6cfrgds2w5pxq4s0i1swqmssxnlvnhl"; + name = "ktp-text-ui-15.12.0.tar.xz"; }; }; ktuberling = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/ktuberling-15.11.90.tar.xz"; - sha256 = "0im0qypwysznjgam115bnqbqsa0rk2z29mwh173lv4gy6dpiyrl4"; - name = "ktuberling-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/ktuberling-15.12.0.tar.xz"; + sha256 = "0sp4hbqi84b2ndavc19jnij76s8x06hz4sg8rjlbk3v86d7gsh7y"; + name = "ktuberling-15.12.0.tar.xz"; }; }; kturtle = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kturtle-15.11.90.tar.xz"; - sha256 = "1hqp0cdk2gjrfyjwqmd7r4d8ghwwvz61z6yal8bwidam3dll6p63"; - name = "kturtle-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kturtle-15.12.0.tar.xz"; + sha256 = "04xa4rr03gr3qbb45ab1paq4jxq297xdg8gmg47mzl81i803hxcl"; + name = "kturtle-15.12.0.tar.xz"; }; }; kubrick = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kubrick-15.11.90.tar.xz"; - sha256 = "0w3184cv8qi0q61ba8hlkj05vbzgpi3rl5sfqyk3wv86vl7vr31d"; - name = "kubrick-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kubrick-15.12.0.tar.xz"; + sha256 = "0p4y9q6f7l6hmk8ip84wbm30p1w8mk54i65gqb3qrbqyxgrw3bdp"; + name = "kubrick-15.12.0.tar.xz"; }; }; kuser = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kuser-15.11.90.tar.xz"; - sha256 = "18033k08p9qmzg1q4s9wi4rv1kb4c19byvkylmkgab48i2ksp946"; - name = "kuser-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kuser-15.12.0.tar.xz"; + sha256 = "1hhglba2jxy56aziyy45d0g5mn2fadn092j6qd81d91qpp41syf5"; + name = "kuser-15.12.0.tar.xz"; }; }; kwalletmanager = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kwalletmanager-15.11.90.tar.xz"; - sha256 = "0h9a2jy4sbpys3frx55gi1zj8r5ysg55lj2bckmd6f3pk9z7h38b"; - name = "kwalletmanager-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kwalletmanager-15.12.0.tar.xz"; + sha256 = "1sb1dq7ngvy0mmjm2dch05d5iifw49kvvdxqz1xhycy7ld09a9nf"; + name = "kwalletmanager-15.12.0.tar.xz"; }; }; kwordquiz = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/kwordquiz-15.11.90.tar.xz"; - sha256 = "1zlq2m2y3z2s1rw74gb7rgwrin4i449z3vqdglgxq6376rzffvx7"; - name = "kwordquiz-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/kwordquiz-15.12.0.tar.xz"; + sha256 = "0mswx58i3zcwzf8m424vsh1rck4vmbjjsy98adyyhhj0szr356sf"; + name = "kwordquiz-15.12.0.tar.xz"; }; }; libkcddb = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkcddb-15.11.90.tar.xz"; - sha256 = "0dsnfkhmwvhp56adh07r1pl3m7045na9xmz065ykmnfb8s4czqyv"; - name = "libkcddb-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkcddb-15.12.0.tar.xz"; + sha256 = "1n40p6byankdwlm2097pnn3lx1hkxhxpr9fw4mjwc40h0185yzl7"; + name = "libkcddb-15.12.0.tar.xz"; }; }; libkcompactdisc = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkcompactdisc-15.11.90.tar.xz"; - sha256 = "1rbhv1fl423swl93sm9vgmqvx1sd3m0337jcjdch3siw3wl1wfff"; - name = "libkcompactdisc-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkcompactdisc-15.12.0.tar.xz"; + sha256 = "1wpkhm3y499wllifqvbcgfypgkl81m0xbdbmji9drvhw59bj287h"; + name = "libkcompactdisc-15.12.0.tar.xz"; }; }; libkdcraw = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkdcraw-15.11.90.tar.xz"; - sha256 = "0lsk89rdx9awsh4mv3m93z0556bmxb1yk68c6aqhryz2ggl6xkld"; - name = "libkdcraw-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkdcraw-15.12.0.tar.xz"; + sha256 = "10l3il1slpwk2djkgv5sh6mfv866mjlv7y799g2qx1kns6pkzf9k"; + name = "libkdcraw-15.12.0.tar.xz"; }; }; libkdeedu = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkdeedu-15.11.90.tar.xz"; - sha256 = "13w3ar3lklbpzd4mg77hab1hqs30jxn5avfr841chp5wpdlr38l1"; - name = "libkdeedu-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkdeedu-15.12.0.tar.xz"; + sha256 = "07i5ibd1p0sxqhv4rc6hl88198nvnrxwhkfd36rfg44n3353gdvi"; + name = "libkdeedu-15.12.0.tar.xz"; }; }; libkdegames = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkdegames-15.11.90.tar.xz"; - sha256 = "1rswaag39jy2qvr1c5p41crr3151i6wqrfrscvf3zgbfs33vgmv7"; - name = "libkdegames-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkdegames-15.12.0.tar.xz"; + sha256 = "1x3303lpks1bh5bpj4slhlqs1b2ajrdwgsipqxvy96qpdbj00lvv"; + name = "libkdegames-15.12.0.tar.xz"; }; }; libkeduvocdocument = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkeduvocdocument-15.11.90.tar.xz"; - sha256 = "1gvrj0sw7v976r449q05i6syvcadcmbfvs51kbrz30dfshjlddrk"; - name = "libkeduvocdocument-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkeduvocdocument-15.12.0.tar.xz"; + sha256 = "0vpa5f3wgvxw2ib5sfngnl1wj1f8z1xq4qrgxs3qhfcl5ci4mcfz"; + name = "libkeduvocdocument-15.12.0.tar.xz"; }; }; libkexiv2 = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkexiv2-15.11.90.tar.xz"; - sha256 = "1kwcxjqds68f37rml334swk0aawla0hia4bzyaf57yhwzd1v9vcj"; - name = "libkexiv2-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkexiv2-15.12.0.tar.xz"; + sha256 = "0gmaris7jjcq8990ccahs00k9yrik077kppxjh4l41ipr3g3kwn2"; + name = "libkexiv2-15.12.0.tar.xz"; }; }; libkface = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkface-15.11.90.tar.xz"; - sha256 = "071nc8vr7rwwkfzcsmldqj2ycgn5y1mq990w21rf6i0iizilqsd9"; - name = "libkface-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkface-15.12.0.tar.xz"; + sha256 = "0zdvwzna9x9d9fdzs7nzrqsfiq6z2f11aj97xl3lhfryqcbwdfyj"; + name = "libkface-15.12.0.tar.xz"; }; }; libkgeomap = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkgeomap-15.11.90.tar.xz"; - sha256 = "0is45slxb3arkrr1w56bc3ynvvdmlm8am92gpyl5pv915l4d4lbb"; - name = "libkgeomap-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkgeomap-15.12.0.tar.xz"; + sha256 = "0l4pfv5a2nq4s4m8xp0s08khlvzd97pfjr6ghlx4wrcygnsqwwy7"; + name = "libkgeomap-15.12.0.tar.xz"; }; }; libkipi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkipi-15.11.90.tar.xz"; - sha256 = "1kfyci0w2dxdsshkak1xffh7zy32j08p64i8nvfzmc92zrj1h1j4"; - name = "libkipi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkipi-15.12.0.tar.xz"; + sha256 = "047ga97fapnk39xcz41c4l6hdvxh4f0zjajl9ll116c20whbi8g1"; + name = "libkipi-15.12.0.tar.xz"; }; }; libkmahjongg = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkmahjongg-15.11.90.tar.xz"; - sha256 = "1lmdjcmx495c8f6idwxjjqdyzq4xlfdij6dmxqbnbjx4l398116r"; - name = "libkmahjongg-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkmahjongg-15.12.0.tar.xz"; + sha256 = "0dgvxc2v48j17n0b547h74w9g8v7n975szzr3bgwkxljkcw99zgc"; + name = "libkmahjongg-15.12.0.tar.xz"; }; }; libkomparediff2 = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libkomparediff2-15.11.90.tar.xz"; - sha256 = "0xdbxzvfbn84gd70zabyvpq63szjxh1zbrdr46ahnh29m2cdk4x2"; - name = "libkomparediff2-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libkomparediff2-15.12.0.tar.xz"; + sha256 = "1spxzl7a6blyfwndissf489dixndycwigcpav5qfdav00s20vbdx"; + name = "libkomparediff2-15.12.0.tar.xz"; }; }; libksane = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/libksane-15.11.90.tar.xz"; - sha256 = "013h5lx93lz2n9il53dxaxx31n62vlmc884wfi40igkksbg5hm3v"; - name = "libksane-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/libksane-15.12.0.tar.xz"; + sha256 = "1262gvy61a07vgam4ws6vjy7q0d7pz9q05d24bcy0dqi6wvlsbwp"; + name = "libksane-15.12.0.tar.xz"; }; }; lokalize = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/lokalize-15.11.90.tar.xz"; - sha256 = "0aw9j7fhni6wrkffjrv8biwsc85mzmcyx7fsm96whwf8xhcs8whp"; - name = "lokalize-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/lokalize-15.12.0.tar.xz"; + sha256 = "0nmqp78a2amgyiisvhqcpxjrvv1p3ssx4wg3gyqz9rw5x7yzh1v7"; + name = "lokalize-15.12.0.tar.xz"; }; }; lskat = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/lskat-15.11.90.tar.xz"; - sha256 = "1n6dmc7vlq9n6wix9fbfnbixjikzpg4hzcqiz8q28qs3lv9kcmxs"; - name = "lskat-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/lskat-15.12.0.tar.xz"; + sha256 = "0nwbsfz6hi20rv8w1hm4lblwifmnyvdyv9icn5z8hlqf2wz0kn73"; + name = "lskat-15.12.0.tar.xz"; }; }; marble = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/marble-15.11.90.tar.xz"; - sha256 = "0xxf7s36m5p88y0xs44j4fn867dfj0qzvhfaqp9drhwc604f4l2i"; - name = "marble-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/marble-15.12.0.tar.xz"; + sha256 = "01hdndic1k5f6fr75152adi0ph8q0ypxhj15yr02l7i2lcwzk9va"; + name = "marble-15.12.0.tar.xz"; }; }; mplayerthumbs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/mplayerthumbs-15.11.90.tar.xz"; - sha256 = "181brlsn21wyzjhb7krf6dx23n8fc2vbzxjz42v13lpvidzw85dk"; - name = "mplayerthumbs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/mplayerthumbs-15.12.0.tar.xz"; + sha256 = "0ghqfcys8qkr7jm5g7i4753bisg6ah36f0i3bm437r27gf8jy2xk"; + name = "mplayerthumbs-15.12.0.tar.xz"; }; }; okteta = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/okteta-15.11.90.tar.xz"; - sha256 = "1l0bpv2xv4l0ccddwg751lg91d9d4bsx3ri1ljp248rw1phgzhjl"; - name = "okteta-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/okteta-15.12.0.tar.xz"; + sha256 = "01fa1ai0c6ifh8gjzhv9jrmpr43h84bj17m22g8z3aa0yci25mfq"; + name = "okteta-15.12.0.tar.xz"; }; }; okular = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/okular-15.11.90.tar.xz"; - sha256 = "0cismifga8difq4s5xxh05cjwfck6a2v3qmijrndy4s442cyhlr6"; - name = "okular-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/okular-15.12.0.tar.xz"; + sha256 = "17bbns5r43h05say0drqyc9w1lfm8vwsqrknaj16cgd2kz23rxwq"; + name = "okular-15.12.0.tar.xz"; }; }; palapeli = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/palapeli-15.11.90.tar.xz"; - sha256 = "09vihdgm05kd61mgwdy50l6ir7s3knngfm3ywf6l6q40bsv3caz4"; - name = "palapeli-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/palapeli-15.12.0.tar.xz"; + sha256 = "18c70brh5gw2rnl4xwxa32avcyv5nmj8q2l826ah9gbx74y0ffjw"; + name = "palapeli-15.12.0.tar.xz"; }; }; parley = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/parley-15.11.90.tar.xz"; - sha256 = "08wzvdkhrj8mp38dl0r2n56xi4vcgbsxsfbislfk1b5c5dkzm00d"; - name = "parley-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/parley-15.12.0.tar.xz"; + sha256 = "0sj5mgbj77p0kj1nylnrjr010nw53a0x3lqfbhxmv09bhszpfnqs"; + name = "parley-15.12.0.tar.xz"; }; }; picmi = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/picmi-15.11.90.tar.xz"; - sha256 = "1w19b3c566p8gsz94gl9ld2f0ck6izaq84rcirmkiah5yg2hjxvi"; - name = "picmi-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/picmi-15.12.0.tar.xz"; + sha256 = "02p2c14bis99f1ylkdclk95awx6b87n2ln555dyy2m3sf7pjdllg"; + name = "picmi-15.12.0.tar.xz"; }; }; poxml = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/poxml-15.11.90.tar.xz"; - sha256 = "1gcih023rdjabx061vqc0hrjnbyqpwx8wrcjaznwdl42kmkjbdjn"; - name = "poxml-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/poxml-15.12.0.tar.xz"; + sha256 = "0l5y2a68yikwjp83c65wyb589yf6jxlj3432wcrj3zkx46l8rwd0"; + name = "poxml-15.12.0.tar.xz"; }; }; print-manager = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/print-manager-15.11.90.tar.xz"; - sha256 = "0ayl181d507yfgr1cqb49ih5394hjqm3kda59217jg0q9cjnfclc"; - name = "print-manager-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/print-manager-15.12.0.tar.xz"; + sha256 = "09vfs3gj46asyqq1dxwil4rvd7pm0svbq4kfj76s0b4likmwn34b"; + name = "print-manager-15.12.0.tar.xz"; }; }; rocs = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/rocs-15.11.90.tar.xz"; - sha256 = "1mpnk6bazn3255fi0q5licq5gggwb8vgwnq35l16h6fl8v92fd43"; - name = "rocs-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/rocs-15.12.0.tar.xz"; + sha256 = "1sgf2ppiwj7yn1yc08lvrd0pfrdfyaxjm1hm5c7mbz2bfz48mv6v"; + name = "rocs-15.12.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/signon-kwallet-extension-15.11.90.tar.xz"; - sha256 = "0l532904s209r9667vb566gm64z4ij7pzkr9m4x8hgk0cj72pygx"; - name = "signon-kwallet-extension-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/signon-kwallet-extension-15.12.0.tar.xz"; + sha256 = "17wwdxyv7w8y7v6kl23czg1ffbhx9yv5siln923zw52wvfd23gwb"; + name = "signon-kwallet-extension-15.12.0.tar.xz"; }; }; spectacle = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/spectacle-15.11.90.tar.xz"; - sha256 = "16d6rg6fi5myb8hndj6xdcpwk8km4dnwqz2i5mfxzs29v2lgwmwl"; - name = "spectacle-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/spectacle-15.12.0.tar.xz"; + sha256 = "0ynffi4k52g1wgdqgswdn4q48zv2z2wa9k7l34m2kqs4qlwlffrh"; + name = "spectacle-15.12.0.tar.xz"; }; }; step = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/step-15.11.90.tar.xz"; - sha256 = "05dik7s4g0amw4bxk3kmfc19yfvd24qd1yxvs9w68bwdsikwwxix"; - name = "step-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/step-15.12.0.tar.xz"; + sha256 = "050nk1kqwjl687x2fd1zslpsjibkq6qsjl61naslrp58xsvninnl"; + name = "step-15.12.0.tar.xz"; }; }; svgpart = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/svgpart-15.11.90.tar.xz"; - sha256 = "0pcb32bpp97iwa3cg4m0wcgsw6zvh00mgl5bmp7kildlsj5nal0c"; - name = "svgpart-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/svgpart-15.12.0.tar.xz"; + sha256 = "01lib7f7nngypxj3fz367fa4hikfh3v03405idsrqb80fm1jwwjr"; + name = "svgpart-15.12.0.tar.xz"; }; }; sweeper = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/sweeper-15.11.90.tar.xz"; - sha256 = "1w3s7j0djggmlwgh5874n58ni8sx8dc348qm792p068d661mn1qz"; - name = "sweeper-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/sweeper-15.12.0.tar.xz"; + sha256 = "0p5lz1zzxsvy0frjzjhn1g8z60qy8ffb69qy6gnkzm5qz2b7c0gc"; + name = "sweeper-15.12.0.tar.xz"; }; }; syndication = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/syndication-15.11.90.tar.xz"; - sha256 = "0f4bp5clqkl5kylz7agr85xazpvs83vmhk4qrkjz0brwfy9k9n8s"; - name = "syndication-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/syndication-15.12.0.tar.xz"; + sha256 = "1awsqsz2603iik7qajv8m19ygyyj16i5iyz24cp2dabxy5zhhn4i"; + name = "syndication-15.12.0.tar.xz"; }; }; umbrello = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/umbrello-15.11.90.tar.xz"; - sha256 = "02byr3977hdckjps8460rjgaz7fs2rbbfki1mds0h6b1ih2nwwmf"; - name = "umbrello-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/umbrello-15.12.0.tar.xz"; + sha256 = "09lkqdialqvx3qgj25gx3wqyz2qfwgy27ahmlac0zg7grjpf0gf9"; + name = "umbrello-15.12.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "15.11.90"; + version = "15.12.0"; src = fetchurl { - url = "${mirror}/unstable/applications/15.11.90/src/zeroconf-ioslave-15.11.90.tar.xz"; - sha256 = "0ldbdfhmzf58is7ygs10if2kjajw77ngaiq7qgvz7b97ssvl8xm3"; - name = "zeroconf-ioslave-15.11.90.tar.xz"; + url = "${mirror}/stable/applications/15.12.0/src/zeroconf-ioslave-15.12.0.tar.xz"; + sha256 = "1mly8j549yd1azc5g5clglypbadxngzml75wvi2irvwsvmzwshf7"; + name = "zeroconf-ioslave-15.12.0.tar.xz"; }; }; } From 86bf3662df02407a940f0a2c1373faf29a424882 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 16:18:42 +0100 Subject: [PATCH 458/498] nss: 3.20.1 -> 3.21 --- .../libraries/nss/85_security_load.patch | 2 +- pkgs/development/libraries/nss/default.nix | 10 +++-- ...ups.patch => nss-3.21-gentoo-fixups.patch} | 38 ++++++++++--------- 3 files changed, 27 insertions(+), 23 deletions(-) rename pkgs/development/libraries/nss/{nss-3.17-gentoo-fixups.patch => nss-3.21-gentoo-fixups.patch} (82%) diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index d20572a051e..3e51e290887 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -48,7 +48,7 @@ diff -ru nss-3.16-orig/nss/lib/util/secload.c nss-3.16/nss/lib/util/secload.c + if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] + * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ + referencePath = NIX_NSS_LIBDIR; -+ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ ++ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ + } if (c) { size_t referencePathSize = 1 + c - referencePath; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 47bb5cde228..ee8e38a7296 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.20.1"; + version = "3.21"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/${name}.tar.gz"; - sha256 = "ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz"; + sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239"; }; buildInputs = [ nspr perl zlib sqlite ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ''; patches = - [ ./nss-3.17-gentoo-fixups.patch + [ ./nss-3.21-gentoo-fixups.patch # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; @@ -58,6 +58,8 @@ in stdenv.mkDerivation rec { "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + postInstall = '' rm -rf $out/private mv $out/public $out/include diff --git a/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch similarity index 82% rename from pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch rename to pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch index 7948fc07150..33819821c19 100644 --- a/pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch +++ b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch @@ -1,5 +1,6 @@ ---- nss-3.17.1/nss/config/Makefile -+++ nss-3.17.1/nss/config/Makefile +diff -urN a/nss/config/Makefile b/nss/config/Makefile +--- a/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/Makefile 2015-11-15 10:42:46.249578304 -0600 @@ -0,0 +1,40 @@ +CORE_DEPTH = .. +DEPTH = .. @@ -41,8 +42,9 @@ + +dummy: all export libs + ---- nss-3.17.1/nss/config/nss-config.in -+++ nss-3.17.1/nss/config/nss-config.in +diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in +--- a/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/nss-config.in 2015-11-15 10:42:46.250578304 -0600 @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -189,8 +191,9 @@ + echo $libdirs +fi + ---- nss-3.17.1/nss/config/nss.pc.in -+++ nss-3.17.1/nss/config/nss.pc.in +diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in +--- a/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ b/nss/config/nss.pc.in 2015-11-15 10:42:46.251578304 -0600 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -201,12 +204,13 @@ +Description: Network Security Services +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Requires: nspr >= 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 ++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + ---- nss-3.17.1/nss/Makefile -+++ nss-3.17.1/nss/Makefile -@@ -44,7 +44,7 @@ +diff -urN a/nss/Makefile b/nss/Makefile +--- a/nss/Makefile 2015-11-15 09:25:06.410786060 -0600 ++++ b/nss/Makefile 2015-11-15 10:42:46.252578304 -0600 +@@ -46,7 +46,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -215,7 +219,7 @@ nss_clean_all: clobber_nspr clobber -@@ -109,12 +109,6 @@ +@@ -115,12 +115,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' @@ -228,14 +232,12 @@ build_docs: $(MAKE) -C $(CORE_DEPTH)/doc ---- nss-3.17.1/nss/manifest.mn -+++ nss-3.17.1/nss/manifest.mn -@@ -10,7 +10,7 @@ +diff -urN a/nss/manifest.mn b/nss/manifest.mn +--- a/nss/manifest.mn 2015-11-15 09:25:06.411786060 -0600 ++++ b/nss/manifest.mn 2015-11-15 10:43:15.633576994 -0600 +@@ -10,4 +10,4 @@ RELEASE = nss --DIRS = coreconf lib cmd +-DIRS = coreconf lib cmd external_tests +DIRS = coreconf lib cmd config - - ifdef NSS_BUILD_GTESTS - DIRS += external_tests From 42d19d7e713b1be95e25908cebaa00c3c0fe7462 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 09:10:39 -0600 Subject: [PATCH 459/498] kdeApps_15_12: don't inherit kdelibs The beta versions of KDE Applications 15.12 did not include a kdelibs release, so that package was borrowed from KDE Applications 15.08. The final release of KDE Applications 15.12.0 does include kdelibs, however. --- pkgs/applications/kde-apps-15.12/default.nix | 2 +- .../0001-old-kde4-cmake-policies.patch | 56 +++++++++++++++++++ .../kdelibs/0002-polkit-install-path.patch | 25 +++++++++ .../kdelibs/0003-remove_xdg_impurities.patch | 47 ++++++++++++++++ .../kde-apps-15.12/kdelibs/default.nix | 43 ++++++++++++++ .../kdelibs/polkit-install.patch | 12 ++++ .../kde-apps-15.12/kdelibs/setup-hook.sh | 10 ++++ .../applications/kde-apps-15.12/ksnapshot.nix | 29 ---------- 8 files changed, 194 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/default.nix create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch create mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh delete mode 100644 pkgs/applications/kde-apps-15.12/ksnapshot.nix diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index 807c32ccb7d..a89f88b58fa 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -27,7 +27,7 @@ let }; packages = self: with self; { - inherit (pkgs.kdeApps_15_08) kdelibs ksnapshot; + kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; ark = callPackage ./ark.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch new file mode 100644 index 00000000000..b7d7300e9a8 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch @@ -0,0 +1,56 @@ +From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 13:54:57 -0500 +Subject: [PATCH 1/2] old kde4 cmake policies + +--- + cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake +index 7d54b9b..c435571 100644 +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -345,6 +345,39 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below ++cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) ++# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) ++cmake_policy(VERSION 2.4.5) ++ ++# CMake 2.6, set compatibility behaviour to cmake 2.4 ++# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above ++# resets the policy settings, so we get a lot of warnings ++ ++# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough ++cmake_policy(SET CMP0000 OLD) ++# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests ++cmake_policy(SET CMP0002 OLD) ++# CMP0003: add the link paths to the link command as with cmake 2.4 ++cmake_policy(SET CMP0003 OLD) ++# CMP0005: keep escaping behaviour for definitions added via add_definitions() ++cmake_policy(SET CMP0005 OLD) ++# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file ++# where this is done, macros and functions are executed with the policies as they ++# were when the were defined. Keep the OLD behaviour so we can set the policies here ++# for all KDE software without the big warning ++cmake_policy(SET CMP0011 OLD) ++ ++# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files ++# in this directory over those from CMAKE_MODULE_PATH ++cmake_policy(SET CMP0017 NEW) ++ ++# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake ++if (POLICY CMP0026) ++ cmake_policy(SET CMP0026 OLD) ++endif (POLICY CMP0026) ++ ++ + # Only do something if it hasn't been found yet + if(NOT KDE4_FOUND) + +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch new file mode 100644 index 00000000000..ff0306ea148 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch @@ -0,0 +1,25 @@ +From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 13:56:03 -0500 +Subject: [PATCH 2/2] polkit install path + +--- + kdecore/auth/ConfigureChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake +index 7cf9cb5..c8334ae 100644 +--- a/kdecore/auth/ConfigureChecks.cmake ++++ b/kdecore/auth/ConfigureChecks.cmake +@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") + ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR + ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) + +- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING ++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING + "Where policy files generated by KAuth will be installed" FORCE) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") + set (KAUTH_COMPILING_FAKE_BACKEND TRUE) +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch new file mode 100644 index 00000000000..a79d7b2b7d1 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch @@ -0,0 +1,47 @@ +diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp +index ab8f76d..2ae5089 100644 +--- a/kdecore/kernel/kstandarddirs.cpp ++++ b/kdecore/kernel/kstandarddirs.cpp +@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults() + else + { + xdgdirList.clear(); +- xdgdirList.append(QString::fromLatin1("/etc/xdg")); +-#ifdef Q_WS_WIN +- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); +-#else +- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); +-#endif + } + + QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); +@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults() + } + } else { + xdgdirList = kdedirDataDirs; +-#ifndef Q_WS_WIN +- xdgdirList.append(QString::fromLatin1("/usr/local/share/")); +- xdgdirList.append(QString::fromLatin1("/usr/share/")); +-#endif + } + + localXdgDir = readEnvPath("XDG_DATA_HOME"); +diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp +index 4c9cad9..6849d45 100644 +--- a/solid/solid/xdgbasedirs.cpp ++++ b/solid/solid/xdgbasedirs.cpp +@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource ) + { + if ( qstrncmp( "data", resource, 4 ) == 0 ) { + if ( instance()->mDataDirs.isEmpty() ) { +- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" ); ++ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" ); + } + return instance()->mDataDirs; + } else if ( qstrncmp( "config", resource, 6 ) == 0 ) { + if ( instance()->mConfigDirs.isEmpty() ) { +- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" ); ++ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" ); + } + return instance()->mConfigDirs; + } diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix new file mode 100644 index 00000000000..a30b19774f2 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix @@ -0,0 +1,43 @@ +{ kdeApp, attica, attr, automoc4, avahi, bison, cmake +, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase +, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig +, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info +, soprano, strigi, udev, xz +, lib +}: + +kdeApp { + name = "kdelibs"; + + buildInputs = [ + attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 + polkit_qt4 qca2 shared_desktop_ontologies udev xz + ]; + propagatedBuildInputs = [ qt4 soprano phonon strigi ]; + nativeBuildInputs = [ + automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info + ]; + + patches = [ + ./0001-old-kde4-cmake-policies.patch + ./0002-polkit-install-path.patch + ./0003-remove_xdg_impurities.patch + ]; + + # cmake does not detect path to `ilmbase` + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + + cmakeFlags = [ + "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" + "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" + "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" + ]; + + setupHook = ./setup-hook.sh; + + meta = { + licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch new file mode 100644 index 00000000000..d2ecac663ec --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake +--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 ++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 +@@ -139,7 +139,7 @@ + ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR + ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) + +- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING ++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING + "Where policy files generated by KAuth will be installed" FORCE) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") + set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh new file mode 100644 index 00000000000..e0a75dc8acd --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh @@ -0,0 +1,10 @@ +addQt4Plugins() { + if [[ -d "$1/lib/qt4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi + + if [[ -d "$1/lib/kde4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi +} +envHooks+=(addQt4Plugins) diff --git a/pkgs/applications/kde-apps-15.12/ksnapshot.nix b/pkgs/applications/kde-apps-15.12/ksnapshot.nix deleted file mode 100644 index b757f4f0403..00000000000 --- a/pkgs/applications/kde-apps-15.12/ksnapshot.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, libkipi -, libXfixes -}: - -kdeApp { - name = "ksnapshot"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - libkipi - libXfixes - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} From da89338993f649eb342df5a8e29f5c009126514a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 09:12:52 -0600 Subject: [PATCH 460/498] plasma55: 5.5.0 -> 5.5.1 --- pkgs/desktops/plasma-5.5/fetchsrcs.sh | 2 +- pkgs/desktops/plasma-5.5/srcs.nix | 304 +++++++++++++------------- 2 files changed, 153 insertions(+), 153 deletions(-) diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh index 7ccb8e3a2e2..2ea23dc5656 100755 --- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh +++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/plasma/5.5.0/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.5.1/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix index 488f4de17ff..63b6a7bee92 100644 --- a/pkgs/desktops/plasma-5.5/srcs.nix +++ b/pkgs/desktops/plasma-5.5/srcs.nix @@ -3,307 +3,307 @@ { bluedevil = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz"; - sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk"; - name = "bluedevil-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/bluedevil-5.5.1.tar.xz"; + sha256 = "09id2vyjdmwl20km0zfwhz2rsyrb2yrfygczh39v1s3nqz88mw97"; + name = "bluedevil-5.5.1.tar.xz"; }; }; breeze = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz"; - sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p"; - name = "breeze-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/breeze-5.5.1.tar.xz"; + sha256 = "03chjfi878r9cz6vy7px0fma8lzrynpnnvbfqw2pbz00mny89hkw"; + name = "breeze-5.5.1.tar.xz"; }; }; breeze-gtk = { - version = "5.5.0.1"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz"; - sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n"; - name = "breeze-gtk-5.5.0.1.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/breeze-gtk-5.5.1.tar.xz"; + sha256 = "10nnahdsyl7rh6r4wzrxjhw6pl5j5b29wkv7a9kkyqjmhmfxsmpq"; + name = "breeze-gtk-5.5.1.tar.xz"; }; }; discover = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz"; - sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4"; - name = "discover-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/discover-5.5.1.tar.xz"; + sha256 = "0nr48126xb48ra9gc40bhbsz74ssrf6dnx189n3sdvb00y7a26wf"; + name = "discover-5.5.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz"; - sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv"; - name = "kde-cli-tools-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kde-cli-tools-5.5.1.tar.xz"; + sha256 = "0izn9fqbrjxcpwwjfr4522jazz2aw8h0r5c4s99hmy5q6hyr59bj"; + name = "kde-cli-tools-5.5.1.tar.xz"; }; }; kdecoration = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz"; - sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra"; - name = "kdecoration-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kdecoration-5.5.1.tar.xz"; + sha256 = "1fdflipbfbivy3p90n30wc6flqck5hx5q4zli42v2a039bzj44jn"; + name = "kdecoration-5.5.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz"; - sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a"; - name = "kde-gtk-config-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kde-gtk-config-5.5.1.tar.xz"; + sha256 = "1pjs59i9xwz3csd86qmvb4c7n766q1dam8llvklkx17i8f9ddri0"; + name = "kde-gtk-config-5.5.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz"; - sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz"; - name = "kdeplasma-addons-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kdeplasma-addons-5.5.1.tar.xz"; + sha256 = "0i59p4dyaz7kz9rcx2hpwg3c7sbwsk4cab9ldcck6vb83szxi1il"; + name = "kdeplasma-addons-5.5.1.tar.xz"; }; }; kgamma5 = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz"; - sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f"; - name = "kgamma5-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kgamma5-5.5.1.tar.xz"; + sha256 = "0qwb2fl27pprr6m2vhr021whpashgan3lx2s91iyb09cxf56883y"; + name = "kgamma5-5.5.1.tar.xz"; }; }; khelpcenter = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz"; - sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09"; - name = "khelpcenter-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/khelpcenter-5.5.1.tar.xz"; + sha256 = "0alsn8xsac0l2zdsk9fvawz3zvg431qgg443p05v6a2pfadb2b0s"; + name = "khelpcenter-5.5.1.tar.xz"; }; }; khotkeys = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz"; - sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl"; - name = "khotkeys-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/khotkeys-5.5.1.tar.xz"; + sha256 = "0rbmdh8yv8ms19kn3r0qcgy0wlrin5jhxic55pc4hdccxy0alchi"; + name = "khotkeys-5.5.1.tar.xz"; }; }; kinfocenter = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz"; - sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy"; - name = "kinfocenter-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kinfocenter-5.5.1.tar.xz"; + sha256 = "0b1z8qsa1qpl9w13ag8154biry44r19nrg1mb5r3wjy22s1nmf40"; + name = "kinfocenter-5.5.1.tar.xz"; }; }; kmenuedit = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz"; - sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n"; - name = "kmenuedit-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kmenuedit-5.5.1.tar.xz"; + sha256 = "0wk5lainva9pc8ccflpfgil9b9vi6wf1vfd5pkn11n9dqr1sbgcq"; + name = "kmenuedit-5.5.1.tar.xz"; }; }; kscreen = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz"; - sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6"; - name = "kscreen-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kscreen-5.5.1.tar.xz"; + sha256 = "1zn31yfk2x9xpqvr0liyna98sk486qqbdgzisx8dl5jm8j7lxm5c"; + name = "kscreen-5.5.1.tar.xz"; }; }; kscreenlocker = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz"; - sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9"; - name = "kscreenlocker-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kscreenlocker-5.5.1.tar.xz"; + sha256 = "0614w38isbqhvw425620mabvczjph52b6mpzzp0ac462ryl5061s"; + name = "kscreenlocker-5.5.1.tar.xz"; }; }; ksshaskpass = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz"; - sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh"; - name = "ksshaskpass-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/ksshaskpass-5.5.1.tar.xz"; + sha256 = "0xafh56wpa7ypj2j4pbgp8p7gk95xa7q3wbab3qw8n7gwjwvgm8v"; + name = "ksshaskpass-5.5.1.tar.xz"; }; }; ksysguard = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz"; - sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv"; - name = "ksysguard-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/ksysguard-5.5.1.tar.xz"; + sha256 = "0zp3hd22hljn1xqdbmayhrbm4niksp9s6p8fx0nv7pnnv8h02vw1"; + name = "ksysguard-5.5.1.tar.xz"; }; }; kwallet-pam = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz"; - sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g"; - name = "kwallet-pam-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kwallet-pam-5.5.1.tar.xz"; + sha256 = "1hk8a82dmvf9h5bhykpfx02b65vx30ziak698sjs0zp0hxfilq56"; + name = "kwallet-pam-5.5.1.tar.xz"; }; }; kwayland = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz"; - sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9"; - name = "kwayland-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kwayland-5.5.1.tar.xz"; + sha256 = "18dxhyphd5chswa39isn47xjhp6v2di5jjs03g21wfc4q0avpd45"; + name = "kwayland-5.5.1.tar.xz"; }; }; kwayland-integration = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz"; - sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4"; - name = "kwayland-integration-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kwayland-integration-5.5.1.tar.xz"; + sha256 = "1ss19cxisz9xj4nh6zjmndpcp6r4gvmpsbqa2wycrvsqq6wrsr5f"; + name = "kwayland-integration-5.5.1.tar.xz"; }; }; kwin = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz"; - sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l"; - name = "kwin-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kwin-5.5.1.tar.xz"; + sha256 = "0gqh98v4h6mc087xdqma5ab478f0zl2v1p6614q9w4si7770i8vl"; + name = "kwin-5.5.1.tar.xz"; }; }; kwrited = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz"; - sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8"; - name = "kwrited-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/kwrited-5.5.1.tar.xz"; + sha256 = "0din1v4jls2bmxx50dx6hs4anfzrr50cb5m8qdq6n0j35p60xq30"; + name = "kwrited-5.5.1.tar.xz"; }; }; libkscreen = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz"; - sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3"; - name = "libkscreen-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/libkscreen-5.5.1.tar.xz"; + sha256 = "1v31hxdrwhrx0n582cp2is09k9slw8a7c8qr5yxc8gi96sj3hb2y"; + name = "libkscreen-5.5.1.tar.xz"; }; }; libksysguard = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz"; - sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8"; - name = "libksysguard-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/libksysguard-5.5.1.tar.xz"; + sha256 = "1zgvxvrmi0amxmn4cmd0g4bdb7b97msdkycsckp7krv5mw5h55dx"; + name = "libksysguard-5.5.1.tar.xz"; }; }; milou = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz"; - sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm"; - name = "milou-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/milou-5.5.1.tar.xz"; + sha256 = "10qsfqx8rqzzy7yg1sikyxh9ycfplmvv30y8rgv4hihnh1yywhks"; + name = "milou-5.5.1.tar.xz"; }; }; oxygen = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz"; - sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x"; - name = "oxygen-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/oxygen-5.5.1.tar.xz"; + sha256 = "0fszhf3xavmygm82kb3i8pymvz9bc5av5mi35d0qj3fzwfgdkd6h"; + name = "oxygen-5.5.1.tar.xz"; }; }; plasma-desktop = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz"; - sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4"; - name = "plasma-desktop-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-desktop-5.5.1.tar.xz"; + sha256 = "1gazhr4501176z6r8psz8wjg3hcfigvpfm02q82aw9jpyy7sjini"; + name = "plasma-desktop-5.5.1.tar.xz"; }; }; plasma-mediacenter = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz"; - sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52"; - name = "plasma-mediacenter-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-mediacenter-5.5.1.tar.xz"; + sha256 = "12xlixrjbs6lmdabp7f9mp6dhwai7qnj5n867q86qv6i836y10dy"; + name = "plasma-mediacenter-5.5.1.tar.xz"; }; }; plasma-nm = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz"; - sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4"; - name = "plasma-nm-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-nm-5.5.1.tar.xz"; + sha256 = "0q0189vz7770xv65skj7a47lbavfgz9a4x4csqv834k40pawkyhg"; + name = "plasma-nm-5.5.1.tar.xz"; }; }; plasma-pa = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz"; - sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km"; - name = "plasma-pa-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-pa-5.5.1.tar.xz"; + sha256 = "13falp4xq028jnkqf5nsv71vv9icclvyk701s5dbcff7v2k2zphk"; + name = "plasma-pa-5.5.1.tar.xz"; }; }; plasma-sdk = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz"; - sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v"; - name = "plasma-sdk-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-sdk-5.5.1.tar.xz"; + sha256 = "1s1k8zdkzpp51dn7w1ra4mswjnrr7nnf7nywdx8k10c0fyxny7hy"; + name = "plasma-sdk-5.5.1.tar.xz"; }; }; plasma-workspace = { - version = "5.5.0"; + version = "5.5.1.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz"; - sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13"; - name = "plasma-workspace-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-5.5.1.1.tar.xz"; + sha256 = "019pmhlry3zyrq4mvs35k1lmz35cwk4xvpl8wy7awx8r631dm4by"; + name = "plasma-workspace-5.5.1.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz"; - sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz"; - name = "plasma-workspace-wallpapers-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-wallpapers-5.5.1.tar.xz"; + sha256 = "1w2bbgcbjvdjxlgd4r3wva87i08y2ngqy85fngpl4387rq234zri"; + name = "plasma-workspace-wallpapers-5.5.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.5.0"; + version = "1-5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz"; - sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c"; - name = "polkit-kde-agent-1-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/polkit-kde-agent-1-5.5.1.tar.xz"; + sha256 = "181d0l0dh7kxdz2ykl6g8mirxjcldm5p2737py3c7g617ysl97c1"; + name = "polkit-kde-agent-1-5.5.1.tar.xz"; }; }; powerdevil = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz"; - sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f"; - name = "powerdevil-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/powerdevil-5.5.1.tar.xz"; + sha256 = "1gjhclm58dxlmb6g8dm2alfqk7iw9fy5vyryn0z6i71j7760aqpp"; + name = "powerdevil-5.5.1.tar.xz"; }; }; sddm-kcm = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz"; - sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0"; - name = "sddm-kcm-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/sddm-kcm-5.5.1.tar.xz"; + sha256 = "0fbnyvyklr409n2qdbyvn1sqhkl7jdabldpv6brq010wd5f2rfrv"; + name = "sddm-kcm-5.5.1.tar.xz"; }; }; systemsettings = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz"; - sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1"; - name = "systemsettings-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/systemsettings-5.5.1.tar.xz"; + sha256 = "19q9yvlvyq61m3xjnii6zfpf5kwnja906i3709ia29132ai4x3sn"; + name = "systemsettings-5.5.1.tar.xz"; }; }; user-manager = { - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz"; - sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729"; - name = "user-manager-5.5.0.tar.xz"; + url = "${mirror}/stable/plasma/5.5.1/user-manager-5.5.1.tar.xz"; + sha256 = "12mrn2fila5m1nzrj196s6q15g91c52zqqbgzi9zqk22n2801l9f"; + name = "user-manager-5.5.1.tar.xz"; }; }; } From cc058eff7052be3e2cfdfc2eef5203521e34444e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 09:44:07 -0600 Subject: [PATCH 461/498] kde5_latest: merge all package sets The three KDE package sets now have circular dependencies between them, so they can only be built if they are merged into a single package set during evaluation. --- .../services/x11/desktop-managers/kde5.nix | 98 ++++++++-------- pkgs/applications/kde-apps-15.12/default.nix | 15 ++- pkgs/desktops/plasma-5.5/default.nix | 50 ++++---- .../libraries/kde-frameworks-5.17/default.nix | 44 ++++--- pkgs/top-level/all-packages.nix | 107 +++++++++--------- 5 files changed, 154 insertions(+), 160 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 06fc622325f..933efa08fa3 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -8,9 +8,7 @@ let cfg = xcfg.desktopManager.kde5; xorg = pkgs.xorg; - kf5 = pkgs.kf5_stable; - plasma5 = pkgs.plasma5_stable; - kdeApps = pkgs.kdeApps_stable; + kde5 = pkgs.kde5; in @@ -57,12 +55,12 @@ in services.xserver.desktopManager.session = singleton { name = "kde5"; bgSupport = true; - start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; + start = ''exec ${kde5.plasma-workspace}/bin/startkde;''; }; security.setuidOwners = singleton { program = "kcheckpass"; - source = "${plasma5.plasma-workspace}/lib/libexec/kcheckpass"; + source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass"; owner = "root"; group = "root"; setuid = true; @@ -72,61 +70,61 @@ in [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme - kf5.frameworkintegration - kf5.kinit + kde5.frameworkintegration + kde5.kinit - plasma5.breeze - plasma5.kde-cli-tools - plasma5.kdeplasma-addons - plasma5.kgamma5 - plasma5.khelpcenter - plasma5.khotkeys - plasma5.kinfocenter - plasma5.kmenuedit - plasma5.kscreen - plasma5.ksysguard - plasma5.kwayland - plasma5.kwin - plasma5.kwrited - plasma5.milou - plasma5.oxygen - plasma5.polkit-kde-agent - plasma5.systemsettings + kde5.breeze + kde5.kde-cli-tools + kde5.kdeplasma-addons + kde5.kgamma5 + kde5.khelpcenter + kde5.khotkeys + kde5.kinfocenter + kde5.kmenuedit + kde5.kscreen + kde5.ksysguard + kde5.kwayland + kde5.kwin + kde5.kwrited + kde5.milou + kde5.oxygen + kde5.polkit-kde-agent + kde5.systemsettings - plasma5.plasma-desktop - plasma5.plasma-workspace - plasma5.plasma-workspace-wallpapers + kde5.plasma-desktop + kde5.plasma-workspace + kde5.plasma-workspace-wallpapers - kdeApps.ark - kdeApps.dolphin - kdeApps.dolphin-plugins - kdeApps.ffmpegthumbs - kdeApps.gwenview - kdeApps.kate - kdeApps.kdegraphics-thumbnailers - kdeApps.konsole - kdeApps.okular - kdeApps.print-manager + kde5.ark + kde5.dolphin + kde5.dolphin-plugins + kde5.ffmpegthumbs + kde5.gwenview + kde5.kate + kde5.kdegraphics-thumbnailers + kde5.konsole + kde5.okular + kde5.print-manager # Oxygen icons moved to KDE Frameworks 5.16 and later. - (kdeApps.oxygen-icons or kf5.oxygen-icons5) + (kde5.oxygen-icons or kde5.oxygen-icons5) pkgs.hicolor_icon_theme - plasma5.kde-gtk-config + kde5.kde-gtk-config ] # Plasma 5.5 and later has a Breeze GTK theme. # If it is not available, Orion is very similar to Breeze. - ++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion + ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion # Install Breeze icons if available - ++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons + ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons # Optional hardware support features - ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil - ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm - ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa - ++ lib.optional config.powerManagement.enable plasma5.powerdevil + ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil + ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm + ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa + ++ lib.optional config.powerManagement.enable kde5.powerdevil ++ lib.optionals cfg.phonon.gstreamer.enable [ @@ -167,13 +165,13 @@ in }; # Enable GTK applications to load SVG icons - environment.variables = mkIf (lib.hasAttr "breeze-icons" kf5) { + environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }; - fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ]; + fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; - programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; + programs.ssh.askPassword = "${kde5.ksshaskpass}/bin/ksshaskpass"; # Enable helpful DBus services. services.udisks2.enable = true; @@ -185,8 +183,8 @@ in services.xserver.displayManager.sddm = { theme = "breeze"; themes = [ - plasma5.plasma-workspace - (kdeApps.oxygen-icons or kf5.oxygen-icons5) + kde5.plasma-workspace + (kde5.oxygen-icons or kde5.oxygen-icons5) ]; }; diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index a89f88b58fa..d5c0aa44668 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -21,12 +21,13 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; mirror = "mirror://kde"; - kdeApp = import ./kde-app.nix { - inherit stdenv lib; - inherit debug srcs; - }; - packages = self: with self; { + + kdeApp = import ./kde-app.nix { + inherit stdenv lib; + inherit debug srcs; + }; + kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; ark = callPackage ./ark.nix {}; @@ -49,6 +50,4 @@ let l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); }; - newScope = scope: pkgs.kf517.newScope ({ inherit kdeApp; } // scope); - -in lib.makeScope newScope packages +in packages diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix index 812c70c2b00..c9fcbdd8e6a 100644 --- a/pkgs/desktops/plasma-5.5/default.nix +++ b/pkgs/desktops/plasma-5.5/default.nix @@ -16,33 +16,33 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; mirror = "mirror://kde"; - plasmaPackage = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + packages = self: with self; { + plasmaPackage = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; - setupHook = args.setupHook or ./setup-hook.sh; + setupHook = args.setupHook or ./setup-hook.sh; - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); - addPackages = self: with self; { bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-qt4 = callPackage ./breeze-qt4.nix {}; @@ -81,6 +81,4 @@ let systemsettings = callPackage ./systemsettings.nix {}; }; - newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope); - -in lib.makeScope newScope addPackages +in packages diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix index 6c2889aa598..3a865b9d404 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix @@ -14,29 +14,29 @@ let mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + packages = self: with self; { + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); - addPackages = self: with self; { attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; @@ -109,6 +109,4 @@ let threadweaver = callPackage ./threadweaver.nix {}; }; - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages +in packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efc59b70340..b5a17114a4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6859,54 +6859,10 @@ let }; kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); - kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }); + kf517 = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; kf5_stable = kf515; kf5_latest = kf517; - kf5PackagesFun = self: with self; { - - fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; - - k9copy = callPackage ../applications/video/k9copy {}; - - quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - dconf = gnome3.dconf; - tag = "-kf5"; - }; - - quasselClient = quassel.override { - monolithic = false; - client = true; - tag = "-client-kf5"; - }; - - quassel_qt5 = quassel.override { - withKDE = false; - tag = "-qt5"; - }; - - quasselClient_qt5 = quasselClient.override { - withKDE = false; - tag = "-client-qt5"; - }; - - quasselDaemon = quassel.override { - monolithic = false; - daemon = true; - tag = "-daemon-qt5"; - withKDE = false; - }; - - }; - - kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun; - kf517Packages = lib.makeScope kf517.newScope kf5PackagesFun; - kf5Packages = kf515Packages; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { @@ -12250,7 +12206,7 @@ let }; kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); - kdeApps_15_12 = recurseIntoAttrs (import ../applications/kde-apps-15.12 { inherit pkgs; }); + kdeApps_15_12 = import ../applications/kde-apps-15.12 { inherit pkgs; }; kdeApps_stable = kdeApps_15_08; kdeApps_latest = kdeApps_15_12; @@ -14756,11 +14712,56 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; plasma54 = recurseIntoAttrs (import ../desktops/plasma-5.4 { inherit pkgs; }); - plasma55 = recurseIntoAttrs (import ../desktops/plasma-5.5 { inherit pkgs; }); + plasma55 = import ../desktops/plasma-5.5 { inherit pkgs; }; plasma5_stable = plasma54; plasma5_latest = plasma55; - kde5 = kf5_stable // plasma5_stable // kdeApps_stable; + kde5PackagesFun = self: with self; { + + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + + k9copy = callPackage ../applications/video/k9copy {}; + + quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { + monolithic = true; + daemon = false; + client = false; + withKDE = true; + dconf = gnome3.dconf; + tag = "-kf5"; + }; + + quasselClient = quassel.override { + monolithic = false; + client = true; + tag = "-client-kf5"; + }; + + quassel_qt5 = quassel.override { + withKDE = false; + tag = "-qt5"; + }; + + quasselClient_qt5 = quasselClient.override { + withKDE = false; + tag = "-client-qt5"; + }; + + quasselDaemon = quassel.override { + monolithic = false; + daemon = true; + tag = "-daemon-qt5"; + withKDE = false; + }; + + }; + + kde5 = kf5_stable // plasma5_stable // kdeApps_stable // kde5PackagesFun kde5; + + kde5_latest = + recurseIntoAttrs + (lib.makeScope qt55Libs.newScope (self: + kf5_latest self // plasma5_latest self // kdeApps_latest self // kde5PackagesFun self)); theme-vertex = callPackage ../misc/themes/vertex { }; @@ -15784,11 +15785,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; # added 2015-09-30 - quassel_kf5 = kf5Packages.quassel; # added 2015-09-30 - quasselClient_kf5 = kf5Packages.quasselClient; # added 2015-09-30 + quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 + quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 + quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30 + quassel_kf5 = kde5.quassel; # added 2015-09-30 + quasselClient_kf5 = kde5.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 408c3e5033a15a5772548147975d824e1b96fbef Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 09:46:51 -0600 Subject: [PATCH 462/498] kdeApps_15_12.spectacle: init at 15.12.0 --- pkgs/applications/kde-apps-15.12/default.nix | 1 + .../applications/kde-apps-15.12/spectacle.nix | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/kde-apps-15.12/spectacle.nix diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index d5c0aa44668..e96c0c2af33 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -46,6 +46,7 @@ let libkipi = callPackage ./libkipi.nix {}; okular = callPackage ./okular.nix {}; print-manager = callPackage ./print-manager.nix {}; + spectacle = callPackage ./spectacle.nix {}; l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); }; diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/applications/kde-apps-15.12/spectacle.nix new file mode 100644 index 00000000000..849334fb736 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/spectacle.nix @@ -0,0 +1,46 @@ +{ kdeApp, lib +, extra-cmake-modules +, kdoctools +, makeQtWrapper +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kio +, knotifications +, kscreen +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, libkipi +, xcb-util-cursor +}: + +kdeApp { + name = "spectacle"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + makeQtWrapper + ]; + buildInputs = [ + kconfig + kcoreaddons + kdbusaddons + ki18n + kio + knotifications + kscreen + kwidgetsaddons + kwindowsystem + kxmlgui + libkipi + xcb-util-cursor + ]; + postFixup = '' + wrapQtProgram "$out/bin/spectacle" + ''; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + }; +} From 06f491d762675cac21d3ff29974591cc384e63aa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 10:22:19 -0600 Subject: [PATCH 463/498] nixos/xserver: fix typos --- nixos/modules/services/x11/xserver.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 8fcca70bc79..799a7329813 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -519,9 +519,9 @@ in "-terminate" "-config ${configFile}" "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb" - ] ++ optional (cfg.display != null) ":${tostring cfg.display}" + ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" - ++ optional (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ] + ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ] ++ optional (!cfg.enableTCP) "-nolisten tcp"; services.xserver.modules = From 765168061545615f18fcfccbc4ab271bcf7f7f7b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 17:24:48 +0100 Subject: [PATCH 464/498] firefox: 42.0 -> 43.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index b7bd07d01e1..6ee926db693 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -133,8 +133,8 @@ in { firefox = common { pname = "firefox"; - version = "42.0"; - sha256 = "1bm37p1ydxvnflh7kb52g6wfblxqc0kbgjn09sv7g0i9k5k38jlr"; + version = "43.0"; + sha256 = "1slg5m05z67q29mrpjv0a753c4vy1vxhx7p3f75494yfvi0ngcd5"; }; firefox-esr = common { From bb30c79f0bff1a850cd80f2344167fcb6e821dae Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Wed, 16 Dec 2015 18:14:40 +0100 Subject: [PATCH 465/498] vagrant: bring embedded/ libraries in scope of dynamic linker. --- pkgs/development/tools/vagrant/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 085807e1bfa..a39c53f676a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt }: +, libxml2, libxslt, makeWrapper }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; + buildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x ${src} . ''; @@ -89,6 +91,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" + wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib ''; preFixup = '' From 9dae6345f456150b5a62bb8feb20257b2bd07ce2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 20:30:20 +0100 Subject: [PATCH 466/498] Typo --- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index f10e05ac486..fd714b89054 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.tuxera.com/community/; - description = "FUSE-base NTFS driver with full write support"; + description = "FUSE-based NTFS driver with full write support"; maintainers = [ maintainers.urkud ]; platforms = platforms.linux; license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ From 79a3c8a952e7d5cb93a04c6ec6d7db95f99e22d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 20:30:45 +0100 Subject: [PATCH 467/498] 9pfs: Add This is a FUSE-based 9p client. --- pkgs/tools/filesystems/9pfs/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/filesystems/9pfs/default.nix diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix new file mode 100644 index 00000000000..c75cc45170a --- /dev/null +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, fuse }: + +stdenv.mkDerivation rec { + name = "9pfs"; + + src = fetchFromGitHub { + owner = "spewspew"; + repo = "9pfs"; + rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; + sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; + }; + + preConfigure = + '' + substituteInPlace Makefile --replace '-g bin' "" + installFlagsArray+=(BIN=$out/bin MAN=$out/share/man/man1) + mkdir -p $out/bin $out/share/man/man1 + ''; + + buildInputs = [ fuse ]; + + enableParallelBuilding = true; + + meta = { + homepage = https://github.com/spewspew/9pfs; + description = "FUSE-based client of the 9P network filesystem protocol"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7736e33ca1..e18e326aa7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -474,6 +474,8 @@ let ### TOOLS + _9pfs = callPackage ../tools/filesystems/9pfs { }; + "3dfsb" = callPackage ../applications/misc/3dfsb { glibc = glibc.override { debugSymbols = true; }; }; From 848064cef6a9368898bfb8f01c1cb2d5c8373a80 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 16 Dec 2015 12:03:18 -0800 Subject: [PATCH 468/498] remove old patches and attributes from xorgserver --- pkgs/servers/x11/xorg/overrides.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 78be046366d..d6e18254760 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -340,16 +340,12 @@ in # Patches can be pulled from the server-*-apple branches of: # http://cgit.freedesktop.org/~jeremyhu/xserver/ patches = commonPatches ++ [ - ./darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch - ./darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch - ./darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch ./darwin/private-extern.patch ./darwin/bundle_main.patch ./darwin/stub.patch - ./darwin/function-pointer-test.patch ]; configureFlags = [ # note: --enable-xquartz is auto @@ -360,9 +356,6 @@ in "--with-bundle-id-prefix=org.nixos.xquartz" "--with-sha1=CommonCrypto" ]; - __impureHostDeps = ["/System/Library" "/usr"]; - NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include"; - NIX_CFLAGS_LINK = "-L/usr/lib"; preConfigure = '' ensureDir $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" From 46b57614d9fab25550aefa235dcc011e23816f77 Mon Sep 17 00:00:00 2001 From: Tom Dimiduk Date: Wed, 16 Dec 2015 15:24:03 -0500 Subject: [PATCH 469/498] tome4: 1.3.1 -> 1.3.3 --- pkgs/games/tome4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 7b7b0808aa9..8ad0f7723c0 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; name = "tome4-${version}"; src = fetchurl { - url = "http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2"; - sha256 = "9b6658e29ad3be9f8469a61e724350f4dfec676777e471f633d616443dfbc7e7"; + url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + sha256 = "d4c6d6aa0cb73b28172cebf89e4271b0a51c6e7dea744ce9c6d6042dd076e9cd"; }; buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ]; preConfigure = '' From c08fe8407c32b3710b46e8de31a17055054c83a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 15:10:38 +0100 Subject: [PATCH 470/498] Add haskell.packages.ghc7103 package set. --- pkgs/top-level/haskell-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9b3f3e66854..997baa7eaa9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -98,6 +98,10 @@ rec { ghc = compiler.ghc7102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; + ghc7103 = callPackage ../development/haskell-modules { + ghc = compiler.ghc7103; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; From eae27e77980bcbe4f7bcec1b2aec517d29f9630c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 18:32:54 +0100 Subject: [PATCH 471/498] ghc: update version 7.10.3 to 7.10.3a Apply upstream patches that fix minor cosmetic issues in the documentation. --- pkgs/development/compilers/ghc/7.10.3.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 32d6b72970c..ce6db9127d6 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -15,6 +15,11 @@ let ''} ''; + docFixes = fetchurl { + url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; + sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; + }; + in stdenv.mkDerivation rec { @@ -26,6 +31,10 @@ stdenv.mkDerivation rec { sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; }; + patches = [ + docFixes + ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; From a421e7bd4a28c69bded8b17888325e31554f61a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Dec 2015 22:09:37 +0100 Subject: [PATCH 472/498] ghc-7.10.3: don't pass compiler or linker flags through a response file The new GHC version contains a patch [1] that passes linker and compiler flags to GCC via response files rather than directly on the command-line. This is supposed to be beneficial on Windows and other platforms that have trouble dealing with long argument lists. On NixOS, however, this feature breaks the flag handling provided by gcc-wrapper [2] and therefore causes the entire GHC build to fail. This issue has been reported upstream at [3]. It's not clear yet how to remedy this problem, but until we've figured that out we just don't pass compiler flags in response files on NixOS to fix https://github.com/NixOS/nixpkgs/issues/10752. [1] https://github.com/ghc/ghc/commit/296bc70b5ff6c853f2782e9ec5aa47a52110345e [2] https://github.com/NixOS/nixpkgs/issues/11762 [3] https://ghc.haskell.org/trac/ghc/ticket/11147 --- pkgs/development/compilers/ghc/7.10.3.nix | 1 + ...pass-linker-flags-via-response-files.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index ce6db9127d6..f9f863ca78c 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { patches = [ docFixes + ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 ]; buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; diff --git a/pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 00000000000..129a34ecd86 --- /dev/null +++ b/pkgs/development/compilers/ghc/dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,22 @@ +diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs +index 8c3ab1a..47a2da7 100644 +--- a/compiler/main/SysTools.hs ++++ b/compiler/main/SysTools.hs +@@ -414,7 +414,7 @@ runCc dflags args = do + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -928,7 +928,7 @@ runLink dflags args = do + args1 = map Option (getOpts dflags opt_l) + args2 = args0 ++ linkargs ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env + where + ld_filter = case (platformOS (targetPlatform dflags)) of + OSSolaris2 -> sunos_ld_filter From 878692e645d6c7ecc1e26b785b413797b6931b1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 16:54:14 +0100 Subject: [PATCH 473/498] ghc-7.10.3: remove the obsolete build.mk file New versions of GHC allow us to specify those things on the command-line, so the build.mk file is no longer necessary. --- pkgs/development/compilers/ghc/7.10.3.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index f9f863ca78c..88d1bec4d42 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -4,17 +4,6 @@ let - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - docFixes = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; @@ -41,7 +30,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" @@ -52,6 +40,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; # required, because otherwise all symbols from HSffi.o are stripped, and From 1f108490f13020b114f5872b74282ed3ac44eac0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 19:18:29 +0100 Subject: [PATCH 474/498] ghc-HEAD: update build instructions and bump version to current Git master Closes https://github.com/NixOS/nixpkgs/issues/10752. --- pkgs/development/compilers/ghc/head.nix | 52 ++++++++++++++----------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index fe0d0b37371..9b360b609e4 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,32 +1,22 @@ -{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }: - -let - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" - DYNAMIC_BY_DEFAULT = NO - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - -in +{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex +}: stdenv.mkDerivation rec { - version = "7.11.20150828"; + version = "7.11.20151216"; name = "ghc-${version}"; - rev = "38c98e4f61a48084995a5347d76ddd024ce1a09c"; + rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "0wnxrfzjpjcmsmd2i0zg30jg7zpw1rrfwz8r56g314l7xcns6yp1"; + sha256 = "0rjzkzn0hz1vdnjikcbwfs5ggs8r3y4gqxfdn4jzfp45gx94wiwv"; }; + patches = [ + ./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + ]; + postUnpack = '' pushd ghc-${builtins.substring 0 7 rev} echo ${version} >VERSION @@ -38,24 +28,40 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl autoconf automake happy alex ]; + enableParallelBuilding = true; + preConfigure = '' - echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" ''; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; - enableParallelBuilding = true; - # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + done + ''; + meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; From bc5f82dfc26cb9135b419dc706178f4696fdaefe Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 11 Dec 2015 07:46:40 -0500 Subject: [PATCH 475/498] Fixup pointfree package. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fd6d521369f..d844f2a047a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -940,4 +940,8 @@ self: super: { # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; + + # The package doesn't yet compile with new HSE: https://github.com/bmillwood/pointfree/pull/13 + pointfree = super.pointfree.override { haskell-src-exts = self.haskell-src-exts_1_16_0_1; }; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 35fd547d334..00e12b01564 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -92,7 +92,6 @@ self: super: { utf8-string = overrideCabal super.utf8-string (drv: { postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); - pointfree = doJailbreak super.pointfree; # acid-state/safecopy#25 acid-state/safecopy#26 safecopy = dontCheck (super.safecopy); From 97834fc233afe624a052fe4f01d5bc876eeaa208 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sat, 12 Dec 2015 16:49:00 -0500 Subject: [PATCH 476/498] Don't check hindent It appears its test suite has some issues at present, based on https://github.com/chrisdone/hindent/issues/166, which seems to preceed haskell-src-exts-1.17 being released. --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d844f2a047a..ad80220549a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -818,6 +818,8 @@ self: super: { # Byte-compile elisp code for Emacs. hindent = overrideCabal super.hindent (drv: { + # https://github.com/chrisdone/hindent/issues/166 + doCheck = false; executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) From 8baebb55d43804733c77ac8263fe75e92b544a50 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2015 19:33:02 -0600 Subject: [PATCH 477/498] lib/strings: add readPathsFromFile --- lib/strings.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/strings.nix b/lib/strings.nix index ce2c4132bbc..098da975c60 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -235,4 +235,19 @@ rec { then may_be_int else throw "Could not convert ${str} to int."; + # Read a list of paths from `file', relative to the `rootPath'. Lines + # beginning with `#' are treated as comments and ignored. Whitespace + # is significant. + readPathsFromFile = rootPath: file: + let + root = toString rootPath; + lines = + builtins.map (lib.removeSuffix "\n") + (lib.splitString "\n" (builtins.readFile file)); + removeComments = lib.filter (line: !(lib.hasPrefix "#" line)); + relativePaths = removeComments lines; + absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; + in + absolutePaths; + } From d6bec4e77f3431261ee08c19f04d1bf81003f9b7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 15:00:44 -0600 Subject: [PATCH 478/498] add copyPathToStore and copyPathsToStore --- pkgs/build-support/trivial-builders.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 9203425b20a..1350e36940b 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -153,4 +153,10 @@ _EOF_ exec ${bin} "$@" ''; + # Copy a path to the Nix store. + copyPathToStore = builtins.filterSource (p: t: true); + + # Copy a list of paths to the Nix store. + copyPathsToStore = builtins.map copyPathToStore; + } From c10bb5179f6759a0685a3670f490004b8f228d7a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 15:19:54 -0600 Subject: [PATCH 479/498] plasma55.plasma-workspace: update patches The startkde patch was invalidated in the plasma-workspace-5.5.1 release. Quilt is now used to manage these large patches; it is much simpler to use than Git. --- .../0001-qt-5.5-QML-import-paths.patch | 123 ------------------ .../plasma-5.5/plasma-workspace/default.nix | 25 ++-- .../plasma-workspace/qml-import-path.patch | 104 +++++++++++++++ .../plasma-5.5/plasma-workspace/series | 2 + ...kde-NixOS-patches.patch => startkde.patch} | 58 +++------ 5 files changed, 137 insertions(+), 175 deletions(-) delete mode 100644 pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch create mode 100644 pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch create mode 100644 pkgs/desktops/plasma-5.5/plasma-workspace/series rename pkgs/desktops/plasma-5.5/plasma-workspace/{0002-startkde-NixOS-patches.patch => startkde.patch} (90%) diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch deleted file mode 100644 index fd0d596243b..00000000000 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,123 +0,0 @@ -From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 19 Oct 2015 18:55:36 -0500 -Subject: [PATCH 1/2] qt-5.5 QML import paths - ---- - applets/analog-clock/contents/ui/analogclock.qml | 2 +- - applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +- - applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +- - applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +- - applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +- - applets/lock_logout/contents/ui/lockout.qml | 2 +- - applets/notifications/package/contents/ui/main.qml | 2 +- - applets/systemtray/package/contents/ui/main.qml | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml -index edb3af9..7eb839d 100644 ---- a/applets/analog-clock/contents/ui/analogclock.qml -+++ b/applets/analog-clock/contents/ui/analogclock.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar - import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock -diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -index 8d43797..3322369 100644 ---- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.plasma.workspace.components 2.0 - import org.kde.kcoreaddons 1.0 as KCoreAddons --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batteryItem -diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -index b4059cb..ae8eeaf 100755 ---- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -index d4952c6..2b6586d 100644 ---- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog -diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -index a086581..6e1e8be 100755 ---- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.kcoreaddons 1.0 as KCoreAddons - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batterymonitor -diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index 80e7e53..0083cf0 100644 ---- a/applets/lock_logout/contents/ui/lockout.qml -+++ b/applets/lock_logout/contents/ui/lockout.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 - import org.kde.kquickcontrolsaddons 2.0 --import "data.js" as Data -+import "../code/data.js" as Data - - Flow { - id: lockout -diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml -index 2871cdb..3f50856 100644 ---- a/applets/notifications/package/contents/ui/main.qml -+++ b/applets/notifications/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.plasma.private.notifications 1.0 - --import "uiproperties.js" as UiProperties -+import "../code/uiproperties.js" as UiProperties - - MouseEventListener { - id: notificationsApplet -diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml -index 2e26455..864c9c5 100644 ---- a/applets/systemtray/package/contents/ui/main.qml -+++ b/applets/systemtray/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - // import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.private.systemtray 2.0 as SystemTray --import "Layout.js" as LayoutManager -+import "../code/Layout.js" as LayoutManager - - Item { - id: root --- -2.6.3 - diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix index 78db6e51511..2d9364d446e 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix @@ -1,17 +1,19 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, baloo -, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative +{ plasmaPackage, lib, copyPathsToStore +, extra-cmake-modules, kdoctools, makeQtWrapper +, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative , kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime , kjsembed, knewstuff, knotifyconfig, kpackage, krunner , ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage +, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: plasmaPackage rec { name = "plasma-workspace"; + nativeBuildInputs = [ extra-cmake-modules kdoctools @@ -28,11 +30,8 @@ plasmaPackage rec { kidletime krunner ktexteditor kwin libkscreen libksysguard plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; - patches = [ - ./0001-qt-5.5-QML-import-paths.patch - ./0002-startkde-NixOS-patches.patch - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); inherit bash coreutils gnused gnugrep socat; inherit kconfig kinit kservice qttools; inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot; @@ -41,7 +40,14 @@ plasmaPackage rec { substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; + postInstall = '' + rm "$out/bin/startplasmacompositor" + rm "$out/lib/libexec/startplasma" + rm -r "$out/share/wayland-sessions" + ''; + + postFixup = '' wrapQtProgram "$out/bin/ksmserver" wrapQtProgram "$out/bin/plasmawindowed" wrapQtProgram "$out/bin/kcminit_startup" @@ -54,11 +60,6 @@ plasmaPackage rec { wrapQtProgram "$out/bin/kuiserver5" wrapQtProgram "$out/bin/krunner" wrapQtProgram "$out/bin/plasmashell" - wrapQtProgram "$out/lib/libexec/drkonqi" - - rm "$out/bin/startplasmacompositor" - rm "$out/lib/libexec/startplasma" - rm -r "$out/share/wayland-sessions" ''; } diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch new file mode 100644 index 00000000000..1d34001be59 --- /dev/null +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch @@ -0,0 +1,104 @@ +Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml ++++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl + import QtQuick.Layouts 1.1 + + import org.kde.plasma.core 2.0 as PlasmaCore +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: analogclock +Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml ++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml +@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.plasma.workspace.components 2.0 + import org.kde.kcoreaddons 1.0 as KCoreAddons +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batteryItem +Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml ++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as Components + import org.kde.plasma.workspace.components 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + MouseArea { + id: root +Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml ++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma + import org.kde.plasma.components 2.0 as Components + import org.kde.plasma.extras 2.0 as PlasmaExtras + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + FocusScope { + id: dialog +Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml ++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.kcoreaddons 1.0 as KCoreAddons + import org.kde.kquickcontrolsaddons 2.0 +-import "logic.js" as Logic ++import "../code/logic.js" as Logic + + Item { + id: batterymonitor +Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml ++++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml +@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 + import org.kde.kquickcontrolsaddons 2.0 +-import "data.js" as Data ++import "../code/data.js" as Data + + Flow { + id: lockout +Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml ++++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml +@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas + + import org.kde.plasma.private.notifications 1.0 + +-import "uiproperties.js" as UiProperties ++import "../code/uiproperties.js" as UiProperties + + MouseEventListener { + id: notificationsApplet +Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml +=================================================================== +--- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml ++++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml +@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma + // import org.kde.plasma.extras 2.0 as PlasmaExtras + + import org.kde.private.systemtray 2.0 as SystemTray +-import "Layout.js" as LayoutManager ++import "../code/Layout.js" as LayoutManager + + Item { + id: root diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/plasma-5.5/plasma-workspace/series new file mode 100644 index 00000000000..88b54af793e --- /dev/null +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/series @@ -0,0 +1,2 @@ +startkde.patch +qml-import-path.patch diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch similarity index 90% rename from pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch rename to pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch index 4b458580633..802c92da64d 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch @@ -1,16 +1,7 @@ -From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 9 Dec 2015 13:20:02 -0600 -Subject: [PATCH 2/2] startkde NixOS patches - ---- - startkde/startkde.cmake | 211 ++++++++++++++++++++---------------------------- - 1 file changed, 89 insertions(+), 122 deletions(-) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 37ab5cd..130578e 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake +Index: plasma-workspace-5.5.1/startkde/startkde.cmake +=================================================================== +--- plasma-workspace-5.5.1.orig/startkde/startkde.cmake ++++ plasma-workspace-5.5.1/startkde/startkde.cmake @@ -1,8 +1,31 @@ -#!/bin/sh +#!@bash@/bin/bash @@ -44,7 +35,7 @@ index 37ab5cd..130578e 100644 if test "x$1" = x--failsafe; then KDE_FAILSAFE=1 # General failsafe flag KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP +@@ -17,29 +40,16 @@ trap 'echo GOT SIGHUP' HUP # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -78,7 +69,7 @@ index 37ab5cd..130578e 100644 fi # Boot sequence: -@@ -56,13 +66,8 @@ fi +@@ -57,13 +67,8 @@ fi # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys @@ -94,7 +85,7 @@ index 37ab5cd..130578e 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <&2 @@ -273,7 +264,7 @@ index 37ab5cd..130578e 100644 # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -@@ -317,11 +279,11 @@ fi +@@ -318,11 +280,11 @@ fi # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -287,7 +278,7 @@ index 37ab5cd..130578e 100644 KDE_SESSION_UID=`id -ru` export KDE_SESSION_UID -@@ -331,11 +293,11 @@ export XDG_CURRENT_DESKTOP +@@ -332,11 +294,11 @@ export XDG_CURRENT_DESKTOP # At this point all the environment is ready, let's send it to kwalletd if running if test -n "$PAM_KWALLET_LOGIN" ; then @@ -301,7 +292,7 @@ index 37ab5cd..130578e 100644 fi # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -348,21 +310,26 @@ if test $? -ne 0; then +@@ -349,21 +311,26 @@ if test $? -ne 0; then # Startup error echo 'startkde: Could not sync environment to dbus.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null @@ -331,7 +322,7 @@ index 37ab5cd..130578e 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -378,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" +@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" @@ -366,23 +357,13 @@ index 37ab5cd..130578e 100644 done break fi -@@ -410,21 +377,21 @@ echo 'startkde: Shutting down...' 1>&2 +@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up -kdeinit5_shutdown +@kinit@/bin/kdeinit5_shutdown - echo 'startkde: Running shutdown scripts...' 1>&2 - - # Run scripts found in /plasma-workspace/shutdown - for prefix in `echo "$scriptpath"`; do -- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do -+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" - done - done - unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@xprop@/bin/xprop -root -remove KDE_FULL_SESSION @@ -392,6 +373,3 @@ index 37ab5cd..130578e 100644 unset KDE_SESSION_UID echo 'startkde: Done.' 1>&2 --- -2.6.3 - From 13548530a6be1a1d112239b322eed02e7d32e738 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 15 Dec 2015 18:06:58 +0300 Subject: [PATCH 480/498] networkmanager: fix udev rules file, fixes #11744 --- pkgs/tools/networking/network-manager/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 5b2e14d033a..cf2821e9690 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline -, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }: +, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup +, ethtool, gnused }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -16,6 +17,10 @@ stdenv.mkDerivation rec { substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl substituteInPlace src/ppp-manager/nm-ppp-manager.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe substituteInPlace src/devices/nm-device.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe + substituteInPlace data/85-nm-unmanaged.rules \ + --replace /bin/sh ${stdenv.shell} \ + --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ + --replace /bin/sed ${gnused}/bin/sed configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" ''; From f9eb378eb8518aa4e08727f105f2655ada276f49 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Tue, 15 Dec 2015 14:08:46 +0900 Subject: [PATCH 481/498] riak: fix leveldb hash, fixes #11731 --- pkgs/servers/nosql/riak/1.3.1.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index e773f6ddcc3..df85044b8d1 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, unzip, erlangR15}: +{ stdenv, fetchurl, fetchFromGitHub, unzip, erlangR15}: let srcs = { - riak = fetchurl { + riak = fetchurl { url = "http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/riak-1.3.1.tar.gz"; sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01"; }; - leveldb = fetchurl { - url = "https://github.com/basho/leveldb/archive/1.3.1.zip"; - sha256 = "dc48ba2b44fca11888ea90695d385c494e1a3abd84a6b266b07fdc160ab2ef64"; + leveldb = fetchFromGitHub { + owner = "basho"; + repo = "leveldb"; + rev = "1.3.1"; + sha256 = "1jvv260ic38657y4lwwcvzmhah8xai594xy19r28gkzlpra1lnbb"; }; }; in @@ -22,11 +24,10 @@ stdenv.mkDerivation rec { patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ]; postUnpack = '' - ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip - pushd $sourceRoot/deps/eleveldb/c_src/ - unzip leveldb.zip - mv leveldb-* leveldb - cd ../../ + mkdir -p $sourceRoot/deps/eleveldb/c_src/leveldb + cp -r ${srcs.leveldb}/* $sourceRoot/deps/eleveldb/c_src/leveldb + chmod 755 -R $sourceRoot/deps/eleveldb/c_src/leveldb + pushd $sourceRoot/deps/ mkdir riaknostic/deps cp -R lager riaknostic/deps cp -R getopt riaknostic/deps From db9bc6875f3ad5e7bddcbeab7124bd5b8fc684c6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 14:09:40 -0800 Subject: [PATCH 482/498] coqPackages.flocq: 2.4.0 -> 2.5.0 --- pkgs/development/coq-modules/flocq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 1f1087a85d9..2ee0aeb20a1 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.5.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/33979/flocq-${version}.tar.gz"; sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml"; }; From 2cd323a51a6f1657c57003dec47181d01733416f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 14:10:31 -0800 Subject: [PATCH 483/498] tor: Allow building on Darwin --- pkgs/tools/security/tor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 9e73c7d4053..a03a945f805 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # Note: torsocks is specified as a dependency, as the distributed # 'torify' wrapper attempts to use it; although there is no # ./configure time check for any of this. - buildInputs = [ libevent openssl zlib torsocks libseccomp ]; + buildInputs = [ libevent openssl zlib torsocks ] ++ + stdenv.lib.optional stdenv.isLinux libseccomp; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; From fd45c7b82b65c31a5be7854d8566260b781c6d6b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 14:10:45 -0800 Subject: [PATCH 484/498] haskellPackages.git-annex: Do not use lsof on Darwin --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad80220549a..41fdfad528a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -66,11 +66,13 @@ self: super: { # build which has the assistant to be used in the top-level. git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; + lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; git-annex = (disableCabalFlag super.git-annex "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; + lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; From b797a67ffb56d3072bba3d2f5646fb23223b0783 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Dec 2015 21:39:26 +0100 Subject: [PATCH 485/498] awesomebump: Add --- .../graphics/awesomebump/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/graphics/awesomebump/default.nix diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix new file mode 100644 index 00000000000..77bddec7eb8 --- /dev/null +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, qt5, makeWrapper }: + +stdenv.mkDerivation { + name = "awesomebump-4.0"; + + src = fetchurl { + url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz; + sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2"; + }; + + setSourceRoot = "sourceRoot=$(echo */Sources)"; + + buildInputs = [ qt5.base makeWrapper ]; + + preBuild = "qmake"; + + enableParallelBuilding = true; + + installPhase = + '' + d=$out/libexec/AwesomeBump + mkdir -p $d $out/bin + cp AwesomeBump $d/ + cp -prd ../Bin/Configs ../Bin/Core $d/ + + # AwesomeBump expects to find Core and Configs in its current + # directory. + makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ + --run "cd $d" + ''; + + meta = { + homepage = https://github.com/kmkolasinski/AwesomeBump; + description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e18e326aa7f..b43d1f737e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11092,6 +11092,8 @@ let }; awesome = awesome-3-5; + awesomebump = callPackage ../applications/graphics/awesomebump { }; + inherit (gnome3) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; From 123a6041defdf57ba443f86a0d39a4b87f60bad4 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 16 Dec 2015 22:35:01 +0000 Subject: [PATCH 486/498] rmlint: 2.4.1 -> 2.4.2 --- pkgs/tools/misc/rmlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 967efd3fae3..3c3f8c86439 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "1ja73r6ijklvw34yv0fgflc1ps58xnd559rjnxkqfmi33xjwx7f0"; + sha256 = "0rfgzamrw89z67jxg8b5jqjmvql00304n0ai4a81bfl90gybyncf"; }; configurePhase = "scons config"; From 5f709b8974cdee58232a16697dafdb1082f04ad5 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 16 Dec 2015 23:54:24 +0100 Subject: [PATCH 487/498] cutegram: fix version in name --- .../networking/instant-messengers/telegram/cutegram/default.nix | 2 +- .../telegram/libqtelegram-aseman-edition/default.nix | 2 +- .../instant-messengers/telegram/telegram-qml/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index 0a1e79365c3..cf559a04fc5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -3,7 +3,7 @@ , telegram-qml, libqtelegram-aseman-edition }: stdenv.mkDerivation rec { - name = "cutegram-v${version}"; + name = "cutegram-${version}"; version = "2.7.0-stable"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix index 31e0a0dc399..3149ac3279a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia, qtquick1 }: stdenv.mkDerivation rec { - name = "libqtelegram-aseman-edition-v${version}"; + name = "libqtelegram-aseman-edition-${version}"; version = "6.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix index 709dce5e755..4fc1ee37927 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix @@ -3,7 +3,7 @@ , libqtelegram-aseman-edition }: stdenv.mkDerivation rec { - name = "telegram-qml-v${version}"; + name = "telegram-qml-${version}"; version = "0.9.1-stable"; src = fetchFromGitHub { From 59213cc1da2b0055be35a6f7e6fddc805410c556 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 15:13:16 -0800 Subject: [PATCH 488/498] emacs25pre: New expression, from emacs-25 pre-release branch --- .../editors/emacs-25/at-fdcwd.patch | 13 ++ pkgs/applications/editors/emacs-25/builder.sh | 38 ++++++ .../applications/editors/emacs-25/default.nix | 113 ++++++++++++++++++ .../editors/emacs-25/site-start.el | 17 +++ pkgs/top-level/all-packages.nix | 13 ++ 5 files changed, 194 insertions(+) create mode 100644 pkgs/applications/editors/emacs-25/at-fdcwd.patch create mode 100644 pkgs/applications/editors/emacs-25/builder.sh create mode 100644 pkgs/applications/editors/emacs-25/default.nix create mode 100644 pkgs/applications/editors/emacs-25/site-start.el diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch new file mode 100644 index 00000000000..1f99d4e1809 --- /dev/null +++ b/pkgs/applications/editors/emacs-25/at-fdcwd.patch @@ -0,0 +1,13 @@ +diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h +index 5cdb813..7a272e8 100644 +--- a/lib/careadlinkat.h ++++ b/lib/careadlinkat.h +@@ -23,6 +23,8 @@ + #include + #include + ++#define AT_FDCWD -2 ++ + struct allocator; + + /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs-25/builder.sh b/pkgs/applications/editors/emacs-25/builder.sh new file mode 100644 index 00000000000..984a61df6f3 --- /dev/null +++ b/pkgs/applications/editors/emacs-25/builder.sh @@ -0,0 +1,38 @@ +source $stdenv/setup + +# This hook is supposed to be run on Linux. It patches the proper locations of +# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with +# *our* versions, not the ones found in the system, as it would do by default. +# On other platforms, this appears to be unnecessary. +preConfigure() { + for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do + substituteInPlace $i --replace /bin/pwd pwd + done + + case "${system}" in + x86_64-linux) glibclibdir=lib64 ;; + i686-linux) glibclibdir=lib ;; + *) return; + esac + + libc=$(cat ${NIX_CC}/nix-support/orig-libc) + echo "libc: $libc" + + for i in src/s/*.h src/m/*.h; do + substituteInPlace $i \ + --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ + --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ + --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ + --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ + --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ + --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o + done +} + +preInstall () { + for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do + substituteInPlace $i --replace /bin/pwd pwd + done +} + +genericBuild diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix new file mode 100644 index 00000000000..472a686b964 --- /dev/null +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -0,0 +1,113 @@ +{ stdenv, fetchgit, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc +, autoconf, automake +, withX ? !stdenv.isDarwin +, withGTK3 ? false, gtk3 ? null +, withGTK2 ? true, gtk2 +}: + +assert (libXft != null) -> libpng != null; # probably a bug +assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise +assert withGTK2 -> withX || stdenv.isDarwin; +assert withGTK3 -> withX || stdenv.isDarwin; +assert withGTK2 -> !withGTK3 && gtk2 != null; +assert withGTK3 -> !withGTK2 && gtk3 != null; + +let + toolkit = + if withGTK3 then "gtk3" + else if withGTK2 then "gtk2" + else "lucid"; +in + +stdenv.mkDerivation rec { + name = "emacs-25.0.50-1b5630e"; + + builder = ./builder.sh; + + src = fetchgit { + url = "git://git.savannah.gnu.org/emacs.git"; + rev = "1b5630eb47d3f4bade09708c958ab006b83b3fc0"; + sha256 = "0n3qbri84akmy7ad1pbv89j4jn4x9pnkz0p4nbhh6m1c37cbz58l"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ + ./at-fdcwd.patch + ]; + + postPatch = '' + sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el + ''; + + buildInputs = + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext + autoconf automake ] + ++ stdenv.lib.optional stdenv.isLinux dbus + ++ stdenv.lib.optionals withX + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gconf ] + ++ stdenv.lib.optional (withX && withGTK2) gtk2 + ++ stdenv.lib.optional (withX && withGTK3) gtk3 + ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; + + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc + ]; + + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; + + configureFlags = + if stdenv.isDarwin + then [ "--with-ns" "--disable-ns-self-contained" ] + else if withX + then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] + else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) + "-I${cairo}/include/cairo"; + + preBuild = '' + find . -name '*.elc' -delete + ''; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp/ + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv nextstep/Emacs.app $out/Applications + ''; + + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; + platforms = platforms.all; + + # So that Exuberant ctags is preferred + priority = 1; + + longDescription = '' + GNU Emacs is an extensible, customizable text editor—and more. At its + core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + The features of GNU Emacs include: content-sensitive editing modes, + including syntax coloring, for a wide variety of file types including + plain text, source code, and HTML; complete built-in documentation, + including a tutorial for new users; full Unicode support for nearly all + human languages and their scripts; highly customizable, using Emacs + Lisp code or a graphical interface; a large number of extensions that + add other functionality, including a project planner, mail and news + reader, debugger interface, calendar, and more. Many of these + extensions are distributed with GNU Emacs; others are available + separately. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs-25/site-start.el b/pkgs/applications/editors/emacs-25/site-start.el new file mode 100644 index 00000000000..023d6412ed8 --- /dev/null +++ b/pkgs/applications/editors/emacs-25/site-start.el @@ -0,0 +1,17 @@ +;; NixOS specific load-path +(setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + load-path)) + +;;; Make `woman' find the man pages +(eval-after-load 'woman + '(setq woman-manpath + (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + woman-manpath))) + +;; Make tramp work for remote NixOS machines +;;; NOTE: You might want to add +(eval-after-load 'tramp + '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43d1f737e0..905749128b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11466,6 +11466,19 @@ let }); emacs24Macport = self.emacs24Macport_24_5; + emacs25pre = callPackage ../applications/editors/emacs-25 { + # use override to enable additional features + libXaw = xorg.libXaw; + Xaw3d = null; + gconf = null; + alsaLib = null; + imagemagick = null; + acl = null; + gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + inherit (darwin) libobjc; + }; + emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; From e007b1b764540905b9cd224264838b4fb45da631 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 16 Dec 2015 23:21:19 +0000 Subject: [PATCH 489/498] nmap: 7.00 -> 7.01 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index c7d927bdb44..351654b6032 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.00"; + version = "7.01"; src = fetchurl { url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1bh25200jidhb2ig206ibiwv1ngyrl2ka743hnihiihmqq0j6i4z"; + sha256 = "01bpc820fmjl1vd08a3j9fpa84psaa7c3cxc8wpzabms8ckcs7yg"; }; patches = ./zenmap.patch; From 99b253fc1d20040297d74a85ed23f16c8290c4e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Dec 2015 17:30:48 +0100 Subject: [PATCH 490/498] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-47-ga631ea6 using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/e616e3fbaad60a7175f74099bbc89bb063fdc00e - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/1be87a125d082bf6e34d8bf86d2e2879d498f4ba - LTS Haskell: https://github.com/fpco/lts-haskell/commit/253d4da34232ee2e34c825f5937f836f3374abd1 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1ee60f7320be760a668391605963b0cabb85f09e --- .../haskell-modules/configuration-lts-0.0.nix | 32 + .../haskell-modules/configuration-lts-0.1.nix | 32 + .../haskell-modules/configuration-lts-0.2.nix | 32 + .../haskell-modules/configuration-lts-0.3.nix | 32 + .../haskell-modules/configuration-lts-0.4.nix | 32 + .../haskell-modules/configuration-lts-0.5.nix | 32 + .../haskell-modules/configuration-lts-0.6.nix | 32 + .../haskell-modules/configuration-lts-0.7.nix | 32 + .../haskell-modules/configuration-lts-1.0.nix | 33 + .../haskell-modules/configuration-lts-1.1.nix | 34 + .../configuration-lts-1.10.nix | 35 + .../configuration-lts-1.11.nix | 35 + .../configuration-lts-1.12.nix | 35 + .../configuration-lts-1.13.nix | 36 + .../configuration-lts-1.14.nix | 36 + .../configuration-lts-1.15.nix | 36 + .../haskell-modules/configuration-lts-1.2.nix | 34 + .../haskell-modules/configuration-lts-1.4.nix | 34 + .../haskell-modules/configuration-lts-1.5.nix | 34 + .../haskell-modules/configuration-lts-1.7.nix | 34 + .../haskell-modules/configuration-lts-1.8.nix | 34 + .../haskell-modules/configuration-lts-1.9.nix | 34 + .../haskell-modules/configuration-lts-2.0.nix | 36 + .../haskell-modules/configuration-lts-2.1.nix | 36 + .../configuration-lts-2.10.nix | 38 + .../configuration-lts-2.11.nix | 38 + .../configuration-lts-2.12.nix | 38 + .../configuration-lts-2.13.nix | 38 + .../configuration-lts-2.14.nix | 38 + .../configuration-lts-2.15.nix | 38 + .../configuration-lts-2.16.nix | 38 + .../configuration-lts-2.17.nix | 38 + .../configuration-lts-2.18.nix | 38 + .../configuration-lts-2.19.nix | 38 + .../haskell-modules/configuration-lts-2.2.nix | 38 + .../configuration-lts-2.20.nix | 39 + .../configuration-lts-2.21.nix | 40 + .../configuration-lts-2.22.nix | 40 + .../haskell-modules/configuration-lts-2.3.nix | 38 + .../haskell-modules/configuration-lts-2.4.nix | 38 + .../haskell-modules/configuration-lts-2.5.nix | 38 + .../haskell-modules/configuration-lts-2.6.nix | 38 + .../haskell-modules/configuration-lts-2.7.nix | 38 + .../haskell-modules/configuration-lts-2.8.nix | 38 + .../haskell-modules/configuration-lts-2.9.nix | 38 + .../haskell-modules/configuration-lts-3.0.nix | 42 + .../haskell-modules/configuration-lts-3.1.nix | 42 + .../configuration-lts-3.10.nix | 49 + .../configuration-lts-3.11.nix | 50 + .../configuration-lts-3.12.nix | 52 + .../configuration-lts-3.13.nix | 52 + .../configuration-lts-3.14.nix | 54 + .../configuration-lts-3.15.nix | 54 + .../configuration-lts-3.16.nix | 54 + .../configuration-lts-3.17.nix | 59 + .../configuration-lts-3.18.nix | 8030 +++++++++++++++++ .../haskell-modules/configuration-lts-3.2.nix | 43 + .../haskell-modules/configuration-lts-3.3.nix | 44 + .../haskell-modules/configuration-lts-3.4.nix | 44 + .../haskell-modules/configuration-lts-3.5.nix | 44 + .../haskell-modules/configuration-lts-3.6.nix | 45 + .../haskell-modules/configuration-lts-3.7.nix | 47 + .../haskell-modules/configuration-lts-3.8.nix | 48 + .../haskell-modules/configuration-lts-3.9.nix | 48 + .../haskell-modules/hackage-packages.nix | 2593 ++++-- 65 files changed, 12367 insertions(+), 742 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.18.nix diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index bb60198aeaf..23b3bdf8454 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2446,6 +2450,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2685,6 +2690,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_2"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3385,6 +3391,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3510,6 +3517,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3843,6 +3851,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3954,6 +3963,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4555,6 +4565,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5292,6 +5303,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5378,6 +5390,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5436,6 +5449,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5731,6 +5745,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5950,6 +5965,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6362,6 +6378,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6372,6 +6389,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6380,6 +6398,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6549,6 +6568,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7155,6 +7175,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7444,6 +7465,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7562,6 +7584,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7978,6 +8001,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8139,6 +8164,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8169,6 +8195,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8207,6 +8234,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8451,6 +8479,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8530,6 +8561,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 77b66031ece..22a5f246372 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2445,6 +2449,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2684,6 +2689,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_2"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3384,6 +3390,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3509,6 +3516,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3842,6 +3850,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3953,6 +3962,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4554,6 +4564,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5291,6 +5302,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5377,6 +5389,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5435,6 +5448,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5730,6 +5744,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5949,6 +5964,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6361,6 +6377,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6371,6 +6388,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6379,6 +6397,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6548,6 +6567,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7154,6 +7174,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7443,6 +7464,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7561,6 +7583,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7977,6 +8000,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8138,6 +8163,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8168,6 +8194,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8206,6 +8233,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8450,6 +8478,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8529,6 +8560,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index da9c527ffa9..adfe05857ed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2445,6 +2449,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2684,6 +2689,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_2"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3384,6 +3390,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3509,6 +3516,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3842,6 +3850,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3953,6 +3962,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4554,6 +4564,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5291,6 +5302,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5377,6 +5389,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5435,6 +5448,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5730,6 +5744,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5949,6 +5964,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6361,6 +6377,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6371,6 +6388,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6379,6 +6397,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6548,6 +6567,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7154,6 +7174,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7443,6 +7464,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7561,6 +7583,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7977,6 +8000,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8138,6 +8163,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8168,6 +8194,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8206,6 +8233,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8450,6 +8478,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8529,6 +8560,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 04168fba70a..1856c9787ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2445,6 +2449,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2684,6 +2689,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_2"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3384,6 +3390,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3509,6 +3516,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3842,6 +3850,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3953,6 +3962,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4554,6 +4564,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5291,6 +5302,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5377,6 +5389,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5435,6 +5448,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5730,6 +5744,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5949,6 +5964,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6361,6 +6377,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6371,6 +6388,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6379,6 +6397,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6548,6 +6567,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7154,6 +7174,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7443,6 +7464,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7561,6 +7583,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7977,6 +8000,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8138,6 +8163,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8168,6 +8194,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8206,6 +8233,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8450,6 +8478,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8529,6 +8560,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index e0cd9431130..26af9f6a7c4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2445,6 +2449,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2683,6 +2688,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3383,6 +3389,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3508,6 +3515,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3839,6 +3847,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3950,6 +3959,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4551,6 +4561,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5288,6 +5299,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5374,6 +5386,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5432,6 +5445,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5727,6 +5741,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5946,6 +5961,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6358,6 +6374,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6368,6 +6385,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6376,6 +6394,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6545,6 +6564,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7150,6 +7170,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7439,6 +7460,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7557,6 +7579,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7972,6 +7995,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8133,6 +8158,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8163,6 +8189,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8201,6 +8228,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8445,6 +8473,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8524,6 +8555,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 44d0e9653ad..a41c1bfc3b4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -810,6 +810,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1752,6 +1753,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1920,7 +1922,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2445,6 +2449,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2683,6 +2688,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3383,6 +3389,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3508,6 +3515,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3839,6 +3847,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3950,6 +3959,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4551,6 +4561,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5288,6 +5299,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5374,6 +5386,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5432,6 +5445,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5727,6 +5741,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5946,6 +5961,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6358,6 +6374,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6368,6 +6385,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6376,6 +6394,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6545,6 +6564,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7150,6 +7170,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7439,6 +7460,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7557,6 +7579,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7972,6 +7995,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8133,6 +8158,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8163,6 +8189,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8201,6 +8228,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8445,6 +8473,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8524,6 +8555,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 3f4405e5b5d..fadd237ffbc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -809,6 +809,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1749,6 +1750,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1917,7 +1919,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2442,6 +2446,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2680,6 +2685,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3380,6 +3386,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3505,6 +3512,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3836,6 +3844,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3947,6 +3956,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4547,6 +4557,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5284,6 +5295,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5370,6 +5382,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5428,6 +5441,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5723,6 +5737,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5941,6 +5956,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6353,6 +6369,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6363,6 +6380,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6371,6 +6389,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6540,6 +6559,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7144,6 +7164,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7433,6 +7454,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7551,6 +7573,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7966,6 +7989,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8127,6 +8152,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8157,6 +8183,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8195,6 +8222,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8438,6 +8466,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8517,6 +8548,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index f4673ed279f..c5aa7f8ebb9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -809,6 +809,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1749,6 +1750,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1917,7 +1919,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2442,6 +2446,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2680,6 +2685,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = doDistribute super."distributed-process_0_5_3"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -3380,6 +3386,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_1"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3505,6 +3512,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3836,6 +3844,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3947,6 +3956,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4547,6 +4557,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5284,6 +5295,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5370,6 +5382,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5428,6 +5441,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5723,6 +5737,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5941,6 +5956,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6353,6 +6369,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6363,6 +6380,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6371,6 +6389,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6540,6 +6559,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -7144,6 +7164,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7433,6 +7454,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7551,6 +7573,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7966,6 +7989,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8127,6 +8152,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8157,6 +8183,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8195,6 +8222,7 @@ self: super: { "unbounded-delays" = doDistribute super."unbounded-delays_0_1_0_8"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8438,6 +8466,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8517,6 +8548,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index b8a801b5b39..dac2e4c977f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -805,6 +805,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1744,6 +1745,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1910,7 +1912,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2433,6 +2437,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2671,6 +2676,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3370,6 +3376,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3494,6 +3501,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3826,6 +3834,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3937,6 +3946,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4535,6 +4545,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5272,6 +5283,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5358,6 +5370,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5416,6 +5429,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5711,6 +5725,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5929,6 +5944,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6340,6 +6356,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6350,6 +6367,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6358,6 +6376,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6527,6 +6546,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6687,6 +6707,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7129,6 +7150,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7417,6 +7439,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7535,6 +7558,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7950,6 +7974,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8111,6 +8137,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8141,6 +8168,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8178,6 +8206,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8421,6 +8450,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8500,6 +8532,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_3"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 349496ec6c7..fbcdb8a86f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -805,6 +805,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1744,6 +1745,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1909,7 +1911,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2430,6 +2434,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2668,6 +2673,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3366,6 +3372,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3490,6 +3497,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3822,6 +3830,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3932,6 +3941,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4508,6 +4518,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4527,6 +4538,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5264,6 +5276,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5350,6 +5363,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5408,6 +5422,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5702,6 +5717,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5920,6 +5936,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6331,6 +6348,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6341,6 +6359,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6349,6 +6368,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6518,6 +6538,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6678,6 +6699,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7120,6 +7142,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7407,6 +7430,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7525,6 +7549,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7936,6 +7961,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8097,6 +8124,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8127,6 +8155,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8164,6 +8193,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8406,6 +8436,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8485,6 +8518,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index fdb4664c342..992d6212022 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1742,6 +1743,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1888,6 +1890,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1905,7 +1908,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2424,6 +2429,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2662,6 +2668,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3356,6 +3363,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3479,6 +3487,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3810,6 +3819,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3919,6 +3929,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4494,6 +4505,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4513,6 +4525,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5241,6 +5254,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5327,6 +5341,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5385,6 +5400,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5679,6 +5695,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5895,6 +5912,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6303,6 +6321,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6313,6 +6332,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6321,6 +6341,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6490,6 +6511,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6649,6 +6671,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7090,6 +7113,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7376,6 +7400,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7494,6 +7519,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7902,6 +7928,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8061,6 +8089,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8091,6 +8120,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8128,6 +8158,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8369,6 +8400,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8448,6 +8482,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index ddc53549cca..8aa2db947bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1742,6 +1743,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1888,6 +1890,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1905,7 +1908,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2424,6 +2429,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2662,6 +2668,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3355,6 +3362,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3478,6 +3486,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3809,6 +3818,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3918,6 +3928,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4493,6 +4504,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4512,6 +4524,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5237,6 +5250,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5323,6 +5337,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5381,6 +5396,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5675,6 +5691,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5891,6 +5908,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6299,6 +6317,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6309,6 +6328,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6317,6 +6337,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6486,6 +6507,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6645,6 +6667,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7086,6 +7109,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7372,6 +7396,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7490,6 +7515,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7898,6 +7924,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8057,6 +8085,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8087,6 +8116,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8124,6 +8154,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8365,6 +8396,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8444,6 +8478,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 9c8020b067b..87461679853 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1742,6 +1743,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1888,6 +1890,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1905,7 +1908,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2424,6 +2429,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2662,6 +2668,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3355,6 +3362,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3478,6 +3486,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3809,6 +3818,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3918,6 +3928,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4492,6 +4503,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4511,6 +4523,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5236,6 +5249,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5322,6 +5336,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5380,6 +5395,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5674,6 +5690,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5890,6 +5907,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6298,6 +6316,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6308,6 +6327,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6316,6 +6336,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6485,6 +6506,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6644,6 +6666,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7085,6 +7108,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7371,6 +7395,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7488,6 +7513,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7895,6 +7921,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8054,6 +8082,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8084,6 +8113,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8121,6 +8151,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8362,6 +8393,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8441,6 +8475,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 906bf0a6a41..e50346655f1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1742,6 +1743,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1888,6 +1890,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1905,7 +1908,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2424,6 +2429,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2561,6 +2567,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2661,6 +2668,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3354,6 +3362,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3477,6 +3486,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3807,6 +3817,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3916,6 +3927,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4490,6 +4502,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4509,6 +4522,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5234,6 +5248,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5320,6 +5335,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5378,6 +5394,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5672,6 +5689,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5888,6 +5906,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6296,6 +6315,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6306,6 +6326,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6314,6 +6335,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6483,6 +6505,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6642,6 +6665,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7083,6 +7107,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7369,6 +7394,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7486,6 +7512,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7892,6 +7919,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8051,6 +8080,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8081,6 +8111,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8118,6 +8149,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8359,6 +8391,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8438,6 +8473,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 9fff6650c52..2addeb5c06d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -803,6 +803,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1740,6 +1741,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1886,6 +1888,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1903,7 +1906,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2421,6 +2426,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2558,6 +2564,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2658,6 +2665,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3351,6 +3359,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3474,6 +3483,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3804,6 +3814,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3913,6 +3924,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4486,6 +4498,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4505,6 +4518,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5229,6 +5243,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5315,6 +5330,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5373,6 +5389,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5665,6 +5682,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5881,6 +5899,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6289,6 +6308,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6299,6 +6319,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6307,6 +6328,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6476,6 +6498,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6634,6 +6657,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7075,6 +7099,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7361,6 +7386,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7478,6 +7504,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7884,6 +7911,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8043,6 +8072,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8073,6 +8103,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8110,6 +8141,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8351,6 +8383,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8430,6 +8465,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 4078218a73f..5682f7e1f25 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -803,6 +803,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1739,6 +1740,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1885,6 +1887,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1902,7 +1905,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2417,6 +2422,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2554,6 +2560,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2654,6 +2661,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3346,6 +3354,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3469,6 +3478,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3799,6 +3809,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3908,6 +3919,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4481,6 +4493,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4500,6 +4513,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5224,6 +5238,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5310,6 +5325,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5368,6 +5384,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5660,6 +5677,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5874,6 +5892,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6282,6 +6301,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6292,6 +6312,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6300,6 +6321,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6469,6 +6491,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6625,6 +6648,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7066,6 +7090,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7352,6 +7377,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7468,6 +7494,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7873,6 +7900,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8032,6 +8061,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8062,6 +8092,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8099,6 +8130,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8340,6 +8372,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8419,6 +8454,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 0c298e5d465..d5b3f51926b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -805,6 +805,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1744,6 +1745,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1909,7 +1911,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2428,6 +2432,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2666,6 +2671,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3364,6 +3370,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3487,6 +3494,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3819,6 +3827,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3929,6 +3938,7 @@ self: super: { "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; "haskell-src" = doDistribute super."haskell-src_1_0_1_6"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4505,6 +4515,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4524,6 +4535,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5261,6 +5273,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5347,6 +5360,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5405,6 +5419,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5699,6 +5714,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5917,6 +5933,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6327,6 +6344,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6337,6 +6355,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6345,6 +6364,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6514,6 +6534,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6673,6 +6694,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7114,6 +7136,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7401,6 +7424,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7519,6 +7543,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7930,6 +7955,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8091,6 +8118,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8121,6 +8149,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8158,6 +8187,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8400,6 +8430,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8479,6 +8512,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index d7f56325fbf..0b3ac781834 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1743,6 +1744,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1908,7 +1910,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2427,6 +2431,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2665,6 +2670,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3362,6 +3368,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3485,6 +3492,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3817,6 +3825,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3926,6 +3935,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4502,6 +4512,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4521,6 +4532,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5258,6 +5270,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5344,6 +5357,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5402,6 +5416,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5696,6 +5711,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5913,6 +5929,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6322,6 +6339,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6332,6 +6350,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6340,6 +6359,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6509,6 +6529,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6668,6 +6689,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7109,6 +7131,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7396,6 +7419,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7514,6 +7538,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7924,6 +7949,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8085,6 +8112,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8115,6 +8143,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8152,6 +8181,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8394,6 +8424,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8473,6 +8506,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 11b2b868116..fd90d1d8d45 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1743,6 +1744,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1907,7 +1909,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2426,6 +2430,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2664,6 +2669,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3361,6 +3367,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3484,6 +3491,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3816,6 +3824,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3925,6 +3934,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4501,6 +4511,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4520,6 +4531,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5256,6 +5268,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5342,6 +5355,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5400,6 +5414,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5694,6 +5709,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5911,6 +5927,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6320,6 +6337,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6330,6 +6348,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6338,6 +6357,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6507,6 +6527,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6666,6 +6687,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7107,6 +7129,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7394,6 +7417,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7512,6 +7536,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7922,6 +7947,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8082,6 +8109,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8112,6 +8140,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8149,6 +8178,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8390,6 +8420,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8469,6 +8502,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index c0097e30c76..dad8d991a76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1743,6 +1744,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1907,7 +1909,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2426,6 +2430,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2664,6 +2669,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3361,6 +3367,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3484,6 +3491,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3816,6 +3824,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3925,6 +3934,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4501,6 +4511,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4520,6 +4531,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5250,6 +5262,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5336,6 +5349,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5394,6 +5408,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5688,6 +5703,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5905,6 +5921,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6314,6 +6331,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6324,6 +6342,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6332,6 +6351,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6501,6 +6521,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6660,6 +6681,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7101,6 +7123,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7388,6 +7411,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7506,6 +7530,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7916,6 +7941,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8076,6 +8103,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8106,6 +8134,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8143,6 +8172,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8384,6 +8414,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8463,6 +8496,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 5d5aa564450..11ba47df60d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1743,6 +1744,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1907,7 +1909,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2426,6 +2430,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2664,6 +2669,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3359,6 +3365,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3482,6 +3489,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3813,6 +3821,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3922,6 +3931,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4497,6 +4507,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4516,6 +4527,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5245,6 +5257,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5331,6 +5344,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5389,6 +5403,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5683,6 +5698,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5900,6 +5916,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6309,6 +6326,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6319,6 +6337,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6327,6 +6346,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6496,6 +6516,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6655,6 +6676,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7096,6 +7118,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7383,6 +7406,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7501,6 +7525,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7911,6 +7936,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8070,6 +8097,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8100,6 +8128,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8137,6 +8166,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8378,6 +8408,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8457,6 +8490,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d77685d0a06..3d43aab4224 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -804,6 +804,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1743,6 +1744,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1907,7 +1909,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2426,6 +2430,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2664,6 +2669,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3358,6 +3364,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3481,6 +3488,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3812,6 +3820,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3921,6 +3930,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4496,6 +4506,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4515,6 +4526,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5243,6 +5255,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5329,6 +5342,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5387,6 +5401,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = dontDistribute super."machines-directory"; "machines-io" = dontDistribute super."machines-io"; "machines-process" = dontDistribute super."machines-process"; @@ -5681,6 +5696,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5898,6 +5914,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6306,6 +6323,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6316,6 +6334,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6324,6 +6343,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = dontDistribute super."plot"; "plot-gtk" = dontDistribute super."plot-gtk"; @@ -6493,6 +6513,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6652,6 +6673,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7093,6 +7115,7 @@ self: super: { "servant-docs" = dontDistribute super."servant-docs"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7380,6 +7403,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7498,6 +7522,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7908,6 +7933,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -8067,6 +8094,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-eq" = doDistribute super."type-eq_0_4_2"; "type-equality" = dontDistribute super."type-equality"; @@ -8097,6 +8125,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8134,6 +8163,7 @@ self: super: { "unbound-generics" = dontDistribute super."unbound-generics"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8375,6 +8405,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; @@ -8454,6 +8487,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_0_4"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index dc3f8a03f8b..cab9b99357b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1725,6 +1726,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1871,6 +1873,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1888,7 +1891,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2399,6 +2404,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2536,6 +2542,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2636,6 +2643,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3324,6 +3332,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3446,6 +3455,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3773,6 +3783,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3882,6 +3893,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4451,6 +4463,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4471,6 +4484,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5181,6 +5195,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5267,6 +5282,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5324,6 +5340,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5609,6 +5626,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5818,6 +5836,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6223,6 +6242,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6233,6 +6253,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6241,6 +6262,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6410,6 +6432,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6566,6 +6589,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7006,6 +7030,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7288,6 +7313,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7404,6 +7430,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7806,6 +7833,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7965,6 +7994,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7994,6 +8024,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8031,6 +8062,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8271,6 +8303,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8349,6 +8384,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 16ab241c515..3b450fc9081 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1725,6 +1726,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1870,6 +1872,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1887,7 +1890,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2398,6 +2403,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2535,6 +2541,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2635,6 +2642,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3323,6 +3331,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3445,6 +3454,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3772,6 +3782,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3881,6 +3892,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_8"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4449,6 +4461,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4469,6 +4482,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5179,6 +5193,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5265,6 +5280,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5322,6 +5338,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5607,6 +5624,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5816,6 +5834,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6221,6 +6240,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6231,6 +6251,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6239,6 +6260,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6408,6 +6430,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6564,6 +6587,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -7004,6 +7028,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7286,6 +7311,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7402,6 +7428,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7804,6 +7831,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7963,6 +7992,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7992,6 +8022,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8029,6 +8060,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8268,6 +8300,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8346,6 +8381,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 3f109fadc73..3e703edcc20 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1716,6 +1717,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1859,6 +1861,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1876,7 +1879,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2384,6 +2389,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2520,6 +2526,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2620,6 +2627,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3304,6 +3312,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3349,6 +3358,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3424,6 +3434,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3749,6 +3760,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3858,6 +3870,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4424,6 +4437,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4444,6 +4458,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5146,6 +5161,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5231,6 +5247,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5288,6 +5305,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5568,6 +5586,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5776,6 +5795,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5979,6 +5999,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6177,6 +6198,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6187,6 +6209,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6195,6 +6218,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6362,6 +6386,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6517,6 +6542,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6955,6 +6981,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7235,6 +7262,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7345,6 +7373,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7745,6 +7774,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7902,6 +7933,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7931,6 +7963,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7968,6 +8001,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8207,6 +8241,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8285,6 +8322,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index af11314a5ba..8f8cd53d76b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1715,6 +1716,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1858,6 +1860,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1875,7 +1878,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2383,6 +2388,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2519,6 +2525,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2619,6 +2626,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3302,6 +3310,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3347,6 +3356,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3422,6 +3432,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3747,6 +3758,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3856,6 +3868,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4420,6 +4433,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4440,6 +4454,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5141,6 +5156,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5226,6 +5242,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5283,6 +5300,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5562,6 +5580,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5770,6 +5789,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5972,6 +5992,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_3"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6170,6 +6191,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6180,6 +6202,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6188,6 +6211,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6355,6 +6379,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6510,6 +6535,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6947,6 +6973,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7227,6 +7254,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7337,6 +7365,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7735,6 +7764,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7892,6 +7923,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7921,6 +7953,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7958,6 +7991,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8197,6 +8231,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8275,6 +8312,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 439771557df..b612864ed83 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1715,6 +1716,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1858,6 +1860,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1875,7 +1878,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2383,6 +2388,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2519,6 +2525,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2619,6 +2626,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3302,6 +3310,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3347,6 +3356,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3422,6 +3432,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3747,6 +3758,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3856,6 +3868,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4420,6 +4433,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4440,6 +4454,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5141,6 +5156,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5226,6 +5242,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5283,6 +5300,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5562,6 +5580,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5770,6 +5789,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5972,6 +5992,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_3"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6170,6 +6191,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6180,6 +6202,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6188,6 +6211,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6355,6 +6379,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6510,6 +6535,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6946,6 +6972,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7226,6 +7253,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7336,6 +7364,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7734,6 +7763,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7891,6 +7922,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7920,6 +7952,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7957,6 +7990,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8196,6 +8230,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8274,6 +8311,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 681a3bbcce6..bd2110ef60c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1715,6 +1716,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1858,6 +1860,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1875,7 +1878,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2383,6 +2388,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2519,6 +2525,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2619,6 +2626,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3302,6 +3310,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3347,6 +3356,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3422,6 +3432,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3746,6 +3757,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3855,6 +3867,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4419,6 +4432,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4439,6 +4453,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5139,6 +5154,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5224,6 +5240,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5281,6 +5298,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5560,6 +5578,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5767,6 +5786,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5969,6 +5989,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6167,6 +6188,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6177,6 +6199,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6185,6 +6208,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6352,6 +6376,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6507,6 +6532,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6943,6 +6969,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7223,6 +7250,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7333,6 +7361,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7731,6 +7760,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7888,6 +7919,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7917,6 +7949,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7954,6 +7987,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8193,6 +8227,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8271,6 +8308,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 65ec277782b..cec6bda6e3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1714,6 +1715,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1857,6 +1859,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1874,7 +1877,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2382,6 +2387,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2518,6 +2524,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2618,6 +2625,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3300,6 +3308,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3345,6 +3354,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3420,6 +3430,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3744,6 +3755,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3853,6 +3865,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4417,6 +4430,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4436,6 +4450,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5136,6 +5151,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5221,6 +5237,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5278,6 +5295,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5557,6 +5575,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5764,6 +5783,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5966,6 +5986,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6164,6 +6185,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6174,6 +6196,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6182,6 +6205,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6348,6 +6372,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6503,6 +6528,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6939,6 +6965,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7218,6 +7245,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7328,6 +7356,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7726,6 +7755,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7883,6 +7914,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7912,6 +7944,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7949,6 +7982,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8187,6 +8221,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8265,6 +8302,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 835f61f8334..2d98f22ccc1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1714,6 +1715,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1857,6 +1859,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1874,7 +1877,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2382,6 +2387,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2518,6 +2524,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2618,6 +2625,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3299,6 +3307,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3344,6 +3353,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3419,6 +3429,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3743,6 +3754,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3852,6 +3864,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4416,6 +4429,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4435,6 +4449,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5135,6 +5150,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5220,6 +5236,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5277,6 +5294,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5555,6 +5573,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5760,6 +5779,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5962,6 +5982,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6160,6 +6181,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6170,6 +6192,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6178,6 +6201,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6344,6 +6368,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6499,6 +6524,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6935,6 +6961,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7214,6 +7241,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7323,6 +7351,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7721,6 +7750,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7878,6 +7909,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7907,6 +7939,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7944,6 +7977,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8182,6 +8216,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8260,6 +8297,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index c6d5421a1be..cebef846148 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1713,6 +1714,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1856,6 +1858,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1873,7 +1876,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2379,6 +2384,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2515,6 +2521,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2614,6 +2621,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3293,6 +3301,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3338,6 +3347,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3413,6 +3423,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3737,6 +3748,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3845,6 +3857,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4409,6 +4422,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4428,6 +4442,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5127,6 +5142,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5212,6 +5228,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5269,6 +5286,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5547,6 +5565,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5752,6 +5771,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5954,6 +5974,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6152,6 +6173,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6162,6 +6184,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6170,6 +6193,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6336,6 +6360,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6491,6 +6516,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6927,6 +6953,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7205,6 +7232,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7314,6 +7342,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7712,6 +7741,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7869,6 +7900,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7898,6 +7930,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7935,6 +7968,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8173,6 +8207,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8251,6 +8288,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index b0ec9efa812..5d66775b49e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1710,6 +1711,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1853,6 +1855,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1870,7 +1873,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2376,6 +2381,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2512,6 +2518,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2611,6 +2618,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3287,6 +3295,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3332,6 +3341,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3407,6 +3417,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3731,6 +3742,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3838,6 +3850,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4402,6 +4415,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4421,6 +4435,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5120,6 +5135,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5205,6 +5221,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5262,6 +5279,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5540,6 +5558,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5745,6 +5764,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5946,6 +5966,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6144,6 +6165,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6154,6 +6176,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6162,6 +6185,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6328,6 +6352,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6483,6 +6508,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6918,6 +6944,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7196,6 +7223,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7305,6 +7333,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7703,6 +7732,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7860,6 +7891,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7889,6 +7921,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7926,6 +7959,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8164,6 +8198,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8242,6 +8279,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 18328bd080e..8f3048c29e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1710,6 +1711,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1851,6 +1853,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1868,7 +1871,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2374,6 +2379,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2510,6 +2516,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2609,6 +2616,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3284,6 +3292,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3329,6 +3338,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3404,6 +3414,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3727,6 +3738,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3834,6 +3846,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4397,6 +4410,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4416,6 +4430,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5115,6 +5130,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5200,6 +5216,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5257,6 +5274,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5535,6 +5553,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5739,6 +5758,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5940,6 +5960,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_4"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6137,6 +6158,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6147,6 +6169,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6155,6 +6178,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6321,6 +6345,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6476,6 +6501,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6911,6 +6937,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7189,6 +7216,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7298,6 +7326,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7695,6 +7724,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7852,6 +7883,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7881,6 +7913,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7918,6 +7951,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8155,6 +8189,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8233,6 +8270,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index f4fbe751b3b..fd4812219ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1710,6 +1711,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1851,6 +1853,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1868,7 +1871,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2374,6 +2379,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2510,6 +2516,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2609,6 +2616,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3283,6 +3291,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3328,6 +3337,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3403,6 +3413,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3726,6 +3737,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3833,6 +3845,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4396,6 +4409,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4415,6 +4429,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5114,6 +5129,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5199,6 +5215,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5256,6 +5273,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5532,6 +5550,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5736,6 +5755,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5937,6 +5957,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6134,6 +6155,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6144,6 +6166,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6152,6 +6175,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6318,6 +6342,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6473,6 +6498,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6908,6 +6934,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7184,6 +7211,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7293,6 +7321,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7690,6 +7719,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7847,6 +7878,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7876,6 +7908,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7913,6 +7946,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8150,6 +8184,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8228,6 +8265,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index fa88242206f..f54a7c92e52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1724,6 +1725,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1867,6 +1869,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1884,7 +1887,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2395,6 +2400,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2532,6 +2538,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2632,6 +2639,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3320,6 +3328,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3365,6 +3374,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3441,6 +3451,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3768,6 +3779,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3877,6 +3889,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4445,6 +4458,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4465,6 +4479,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5175,6 +5190,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5261,6 +5277,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5318,6 +5335,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5603,6 +5621,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5812,6 +5831,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6016,6 +6036,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6216,6 +6237,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6226,6 +6248,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6234,6 +6257,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6403,6 +6427,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6559,6 +6584,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6999,6 +7025,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7281,6 +7308,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7397,6 +7425,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7799,6 +7828,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7958,6 +7989,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7987,6 +8019,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8024,6 +8057,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8263,6 +8297,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8341,6 +8378,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index beb329bab16..f78f8e91c56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1710,6 +1711,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1851,6 +1853,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1868,7 +1871,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2373,6 +2378,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2509,6 +2515,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2608,6 +2615,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -2951,6 +2959,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; @@ -3281,6 +3290,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3326,6 +3336,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3401,6 +3412,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3724,6 +3736,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3830,6 +3843,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4393,6 +4407,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4412,6 +4427,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5111,6 +5127,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5196,6 +5213,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5253,6 +5271,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5529,6 +5548,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5733,6 +5753,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5934,6 +5955,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6130,6 +6152,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6140,6 +6163,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6148,6 +6172,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6314,6 +6339,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6469,6 +6495,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6904,6 +6931,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7179,6 +7207,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7288,6 +7317,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7685,6 +7715,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7842,6 +7874,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7871,6 +7904,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7908,6 +7942,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8145,6 +8180,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8223,6 +8261,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 962ee75a7bc..12f836e2f9a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1710,6 +1711,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1851,6 +1853,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1868,7 +1871,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2373,6 +2378,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2509,6 +2515,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2608,6 +2615,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -2951,6 +2959,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; @@ -3281,6 +3290,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3326,6 +3336,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3367,6 +3378,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3400,6 +3412,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3723,6 +3736,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3829,6 +3843,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4392,6 +4407,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4411,6 +4427,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5109,6 +5126,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5194,6 +5212,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5251,6 +5270,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5527,6 +5547,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5731,6 +5752,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5932,6 +5954,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6128,6 +6151,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6138,6 +6162,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6146,6 +6171,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6311,6 +6337,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6466,6 +6493,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6901,6 +6929,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7176,6 +7205,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7285,6 +7315,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7682,6 +7713,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7839,6 +7872,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7868,6 +7902,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7905,6 +7940,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8140,6 +8176,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8218,6 +8257,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 800e96ff390..a1f3a7d8573 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -792,6 +792,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1709,6 +1710,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1850,6 +1852,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1867,7 +1870,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2372,6 +2377,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2508,6 +2514,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2607,6 +2614,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -2950,6 +2958,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; @@ -3280,6 +3289,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3325,6 +3335,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3366,6 +3377,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3399,6 +3411,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3722,6 +3735,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3828,6 +3842,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4390,6 +4405,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4409,6 +4425,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5106,6 +5123,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5191,6 +5209,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5248,6 +5267,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5523,6 +5543,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5727,6 +5748,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5928,6 +5950,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6124,6 +6147,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6134,6 +6158,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6142,6 +6167,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6307,6 +6333,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6462,6 +6489,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6897,6 +6925,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7172,6 +7201,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7281,6 +7311,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7678,6 +7709,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7835,6 +7868,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7864,6 +7898,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7901,6 +7936,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8136,6 +8172,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8214,6 +8253,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 732e6c33b7f..090646697dc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1724,6 +1725,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1867,6 +1869,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1884,7 +1887,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2395,6 +2400,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2532,6 +2538,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2632,6 +2639,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3319,6 +3327,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3364,6 +3373,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3440,6 +3450,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3767,6 +3778,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3876,6 +3888,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4444,6 +4457,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4464,6 +4478,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5173,6 +5188,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5259,6 +5275,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5316,6 +5333,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5601,6 +5619,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5810,6 +5829,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6014,6 +6034,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6214,6 +6235,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6224,6 +6246,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6232,6 +6255,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6401,6 +6425,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6557,6 +6582,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6997,6 +7023,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7278,6 +7305,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7394,6 +7422,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7796,6 +7825,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7955,6 +7986,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7984,6 +8016,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8021,6 +8054,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8260,6 +8294,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8338,6 +8375,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index d39ef0b551d..727580bbaf5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1723,6 +1724,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1866,6 +1868,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1883,7 +1886,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2394,6 +2399,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2531,6 +2537,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2631,6 +2638,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3318,6 +3326,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3363,6 +3372,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3439,6 +3449,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3766,6 +3777,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3875,6 +3887,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4443,6 +4456,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4463,6 +4477,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5172,6 +5187,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5258,6 +5274,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5315,6 +5332,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5599,6 +5617,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5808,6 +5827,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6011,6 +6031,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6210,6 +6231,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6220,6 +6242,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6228,6 +6251,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6397,6 +6421,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6553,6 +6578,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6992,6 +7018,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7273,6 +7300,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7389,6 +7417,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7791,6 +7820,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7950,6 +7981,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7979,6 +8011,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8016,6 +8049,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8255,6 +8289,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8333,6 +8370,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index bc182e5e660..ed098498a05 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1723,6 +1724,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1866,6 +1868,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1883,7 +1886,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2393,6 +2398,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2530,6 +2536,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2630,6 +2637,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3317,6 +3325,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3362,6 +3371,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3438,6 +3448,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3765,6 +3776,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3874,6 +3886,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4442,6 +4455,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4462,6 +4476,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5171,6 +5186,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5256,6 +5272,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5313,6 +5330,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5597,6 +5615,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5806,6 +5825,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6009,6 +6029,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6208,6 +6229,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6218,6 +6240,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6226,6 +6249,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6395,6 +6419,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6551,6 +6576,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6990,6 +7016,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7271,6 +7298,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7386,6 +7414,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7788,6 +7817,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7947,6 +7978,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7976,6 +8008,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8013,6 +8046,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8252,6 +8286,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8330,6 +8367,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index c37a385b4a6..6c1e7ef0a44 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -795,6 +795,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1720,6 +1721,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1863,6 +1865,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1880,7 +1883,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2390,6 +2395,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2527,6 +2533,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2627,6 +2634,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3314,6 +3322,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3359,6 +3368,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3435,6 +3445,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3760,6 +3771,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3869,6 +3881,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4437,6 +4450,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4457,6 +4471,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5166,6 +5181,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5251,6 +5267,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5308,6 +5325,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5592,6 +5610,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5800,6 +5819,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6003,6 +6023,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6202,6 +6223,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6212,6 +6234,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6220,6 +6243,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6389,6 +6413,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6545,6 +6570,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6984,6 +7010,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7265,6 +7292,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7380,6 +7408,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7782,6 +7811,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7939,6 +7970,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7968,6 +8000,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8005,6 +8038,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8244,6 +8278,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8322,6 +8359,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 761dd29669a..68d05b0fae3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -794,6 +794,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1719,6 +1720,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1862,6 +1864,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1879,7 +1882,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2389,6 +2394,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2526,6 +2532,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2626,6 +2633,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3313,6 +3321,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3358,6 +3367,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3434,6 +3444,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3759,6 +3770,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3868,6 +3880,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4436,6 +4449,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4456,6 +4470,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5165,6 +5180,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5250,6 +5266,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5307,6 +5324,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5591,6 +5609,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5799,6 +5818,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -6002,6 +6022,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6201,6 +6222,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6211,6 +6233,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6219,6 +6242,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6388,6 +6412,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6544,6 +6569,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6983,6 +7009,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7264,6 +7291,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7379,6 +7407,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7781,6 +7810,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7938,6 +7969,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7967,6 +7999,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -8004,6 +8037,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8243,6 +8277,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8321,6 +8358,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 1745628da63..15402d99af2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1718,6 +1719,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1861,6 +1863,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1878,7 +1881,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2388,6 +2393,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2525,6 +2531,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2625,6 +2632,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3311,6 +3319,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3356,6 +3365,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3432,6 +3442,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3757,6 +3768,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3866,6 +3878,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4434,6 +4447,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4454,6 +4468,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5161,6 +5176,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5246,6 +5262,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5303,6 +5320,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_0"; "machines-io" = doDistribute super."machines-io_0_2_0_0"; "machines-process" = doDistribute super."machines-process_0_2_0_0"; @@ -5587,6 +5605,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5795,6 +5814,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5998,6 +6018,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6197,6 +6218,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6207,6 +6229,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6215,6 +6238,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6384,6 +6408,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6540,6 +6565,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6978,6 +7004,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7258,6 +7285,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7371,6 +7399,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7773,6 +7802,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7930,6 +7961,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7959,6 +7991,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7996,6 +8029,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8235,6 +8269,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8313,6 +8350,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index cd600bcdea7..c6a043b4b59 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -793,6 +793,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck" = doDistribute super."QuickCheck_2_7_6"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; @@ -1716,6 +1717,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1859,6 +1861,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1876,7 +1879,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2385,6 +2390,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2522,6 +2528,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2622,6 +2629,7 @@ self: super: { "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "disk-free-space" = dontDistribute super."disk-free-space"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "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"; @@ -3306,6 +3314,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = doDistribute super."ghc-mod_5_2_1_2"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = dontDistribute super."ghc-parser"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3351,6 +3360,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_0_2"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3426,6 +3436,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = dontDistribute super."gnuidn"; "gnuplot" = dontDistribute super."gnuplot"; "gnutls" = dontDistribute super."gnutls"; @@ -3751,6 +3762,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3860,6 +3872,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-spacegoo" = dontDistribute super."haskell-spacegoo"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_9"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -4427,6 +4440,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-wai-json" = doDistribute super."hspec-wai-json_0_6_0"; "hspec-webdriver" = dontDistribute super."hspec-webdriver"; "hspec2" = dontDistribute super."hspec2"; @@ -4447,6 +4461,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -5152,6 +5167,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5237,6 +5253,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5294,6 +5311,7 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_4_1"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-directory" = doDistribute super."machines-directory_0_2_0_2"; "machines-io" = doDistribute super."machines-io_0_2_0_2"; "machines-process" = doDistribute super."machines-process_0_2_0_2"; @@ -5577,6 +5595,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5785,6 +5804,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5988,6 +6008,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_2"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -6186,6 +6207,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = dontDistribute super."pipes-text"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-wai" = dontDistribute super."pipes-wai"; "pipes-websockets" = dontDistribute super."pipes-websockets"; @@ -6196,6 +6218,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -6204,6 +6227,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6372,6 +6396,7 @@ self: super: { "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "project-template" = doDistribute super."project-template_0_1_4_2"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6528,6 +6553,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6966,6 +6992,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_3_1"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7246,6 +7273,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7357,6 +7385,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7757,6 +7786,8 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7914,6 +7945,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7943,6 +7975,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7980,6 +8013,7 @@ self: super: { "unbound-generics" = doDistribute super."unbound-generics_0_1_2_1"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -8219,6 +8253,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; @@ -8297,6 +8334,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_1"; "webdriver-angular" = dontDistribute super."webdriver-angular"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 906696b4b9f..18efcac44b5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -779,6 +779,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1652,6 +1653,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1784,6 +1786,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1801,7 +1804,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2294,6 +2299,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2424,6 +2430,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2516,6 +2523,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2847,6 +2855,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; @@ -3168,6 +3177,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = doDistribute super."ghc-parser_0_1_7_0"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3211,6 +3221,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3251,6 +3262,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3284,6 +3296,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3600,6 +3613,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3705,6 +3719,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3929,6 +3944,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4253,6 +4269,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_2"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4272,6 +4289,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4930,6 +4948,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5012,6 +5031,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5066,6 +5086,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5331,6 +5352,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5527,6 +5549,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5721,6 +5744,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5906,6 +5930,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = doDistribute super."pipes-text_0_0_0_16"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5915,6 +5940,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5923,6 +5949,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6087,6 +6114,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6240,6 +6268,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6669,6 +6698,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6936,6 +6966,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7037,6 +7068,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7052,6 +7084,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7423,6 +7456,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7573,6 +7608,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7601,6 +7637,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7637,6 +7674,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7862,6 +7900,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7936,6 +7977,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 77d7e97b3e5..5f272356846 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -779,6 +779,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1650,6 +1651,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1782,6 +1784,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1799,7 +1802,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2292,6 +2297,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2422,6 +2428,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2514,6 +2521,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2844,6 +2852,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3163,6 +3172,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-parser" = doDistribute super."ghc-parser_0_1_7_0"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3206,6 +3216,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3246,6 +3257,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3279,6 +3291,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3595,6 +3608,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3700,6 +3714,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3923,6 +3938,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4247,6 +4263,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_2"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4266,6 +4283,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4924,6 +4942,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -5006,6 +5025,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5059,6 +5079,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5324,6 +5345,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5519,6 +5541,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5713,6 +5736,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5897,6 +5921,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = doDistribute super."pipes-text_0_0_0_16"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5906,6 +5931,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5914,6 +5940,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6078,6 +6105,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6231,6 +6259,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6659,6 +6688,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6926,6 +6956,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7027,6 +7058,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7042,6 +7074,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7413,6 +7446,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7563,6 +7598,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7591,6 +7627,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7627,6 +7664,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7851,6 +7889,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7925,6 +7966,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index d0f30d12556..a41aa1b749b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -771,6 +771,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1629,6 +1630,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1760,6 +1762,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1777,7 +1780,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2259,6 +2264,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2388,6 +2394,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2474,6 +2481,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2796,6 +2804,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3107,6 +3116,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3149,6 +3159,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3187,6 +3198,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3220,6 +3232,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3405,6 +3418,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3515,6 +3529,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3534,6 +3549,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3637,6 +3653,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3857,6 +3874,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4178,6 +4196,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4197,6 +4216,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4242,6 +4262,7 @@ self: super: { "http-accept" = dontDistribute super."http-accept"; "http-api-data" = dontDistribute super."http-api-data"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4842,6 +4863,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4923,6 +4945,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4976,6 +4999,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5235,6 +5259,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5346,6 +5371,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5426,6 +5452,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5618,6 +5645,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5798,6 +5826,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5807,6 +5836,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5815,6 +5845,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5972,6 +6003,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6121,6 +6153,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6542,6 +6575,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1"; @@ -6800,6 +6834,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6899,6 +6934,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6914,6 +6950,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6980,6 +7017,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7176,6 +7214,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7277,6 +7316,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7425,6 +7466,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7453,6 +7495,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7489,6 +7532,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7709,8 +7753,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7778,6 +7826,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 98e84ca9f10..847d00dd79b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -771,6 +771,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1628,6 +1629,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1758,6 +1760,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1775,7 +1778,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2257,6 +2262,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2386,6 +2392,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2472,6 +2479,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2793,6 +2801,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3104,6 +3113,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3145,6 +3155,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3183,6 +3194,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3216,6 +3228,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3401,6 +3414,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3510,6 +3524,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3529,6 +3544,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3632,6 +3648,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3852,6 +3869,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4173,6 +4191,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4192,6 +4211,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4235,7 +4255,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4836,6 +4858,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4917,6 +4940,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4970,6 +4994,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5229,6 +5254,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5340,6 +5366,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5420,6 +5447,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5612,6 +5640,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5790,6 +5819,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5799,6 +5829,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5807,6 +5838,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5964,6 +5996,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6113,6 +6146,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6533,6 +6567,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1"; @@ -6790,6 +6825,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6889,6 +6925,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6904,6 +6941,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6970,6 +7008,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7165,6 +7204,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7266,6 +7306,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7414,6 +7456,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7442,6 +7485,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7478,6 +7522,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7698,8 +7743,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7767,6 +7816,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 154bd227acc..ca3ed4a6fdb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -770,6 +770,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1627,6 +1628,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1757,6 +1759,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1774,7 +1777,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2252,6 +2257,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2381,6 +2387,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2467,6 +2474,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2788,6 +2796,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3099,6 +3108,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3140,6 +3150,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3178,6 +3189,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3211,6 +3223,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3395,6 +3408,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3504,6 +3518,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3523,6 +3538,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3626,6 +3642,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3846,6 +3863,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3899,6 +3917,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -4166,6 +4185,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4185,6 +4205,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4228,7 +4249,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4829,6 +4852,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4910,6 +4934,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4963,6 +4988,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5154,6 +5180,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5221,6 +5248,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5332,6 +5360,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5412,6 +5441,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5604,6 +5634,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5781,6 +5812,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5790,6 +5822,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5798,6 +5831,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5955,6 +5989,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6104,6 +6139,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6524,6 +6560,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1"; @@ -6781,6 +6818,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6880,6 +6918,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6895,6 +6934,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6961,6 +7001,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7154,6 +7195,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7254,6 +7296,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7402,6 +7446,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7430,6 +7475,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7466,6 +7512,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7686,8 +7733,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7755,6 +7806,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 2e000577048..a12b0ab22f4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -770,6 +770,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1627,6 +1628,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1757,6 +1759,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1774,7 +1777,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2252,6 +2257,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2381,6 +2387,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2467,6 +2474,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2788,6 +2796,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3099,6 +3108,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3140,6 +3150,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3178,6 +3189,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3211,6 +3223,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3395,6 +3408,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3504,6 +3518,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3523,6 +3538,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3626,6 +3642,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3845,6 +3862,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3898,6 +3916,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -4165,6 +4184,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4184,6 +4204,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4227,7 +4248,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4827,6 +4850,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4908,6 +4932,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4961,6 +4986,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5152,6 +5178,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5218,6 +5245,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5329,6 +5357,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5409,6 +5438,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5601,6 +5631,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5777,6 +5808,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5786,6 +5818,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5794,6 +5827,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5951,6 +5985,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6100,6 +6135,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6520,6 +6556,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1"; @@ -6777,6 +6814,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6876,6 +6914,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6891,6 +6930,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6957,6 +6997,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7149,6 +7190,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7249,6 +7291,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7397,6 +7441,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7425,6 +7470,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7461,6 +7507,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7680,8 +7727,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7749,6 +7800,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 15706031f7a..30316276737 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -770,6 +770,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1097,6 +1098,7 @@ self: super: { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; @@ -1624,6 +1626,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1753,6 +1756,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1770,7 +1774,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2247,6 +2253,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2376,6 +2383,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2458,6 +2466,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2778,6 +2787,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3089,6 +3099,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3130,6 +3141,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3168,6 +3180,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3201,6 +3214,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3385,6 +3399,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3494,6 +3509,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3513,6 +3529,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3616,7 +3633,9 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_12"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; "haskell-token-utils" = dontDistribute super."haskell-token-utils"; "haskell-tor" = dontDistribute super."haskell-tor"; @@ -3834,6 +3853,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3887,6 +3907,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -4154,6 +4175,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4173,6 +4195,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4215,7 +4238,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4815,6 +4840,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4896,6 +4922,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4948,6 +4975,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5139,6 +5167,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5204,6 +5233,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5315,6 +5345,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5395,6 +5426,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5587,6 +5619,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5762,6 +5795,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5771,6 +5805,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5779,6 +5814,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5936,6 +5972,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6085,6 +6122,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6505,6 +6543,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1"; @@ -6762,6 +6801,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6861,6 +6901,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6876,6 +6917,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6942,6 +6984,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7133,6 +7176,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7233,6 +7277,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7380,6 +7426,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7408,6 +7455,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7444,6 +7492,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7663,8 +7712,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7731,6 +7784,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index a7dfcdb3f68..af656608acf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -769,6 +769,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1096,6 +1097,7 @@ self: super: { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; @@ -1623,6 +1625,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1752,6 +1755,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1769,7 +1773,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2246,6 +2252,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2375,6 +2382,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2457,6 +2465,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2777,6 +2786,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3087,6 +3097,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3128,6 +3139,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3166,6 +3178,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3199,6 +3212,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3383,6 +3397,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3492,6 +3507,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3511,6 +3527,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3613,7 +3630,9 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_12"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; "haskell-token-utils" = dontDistribute super."haskell-token-utils"; "haskell-tor" = dontDistribute super."haskell-tor"; @@ -3831,6 +3850,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3884,6 +3904,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -4150,6 +4171,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4169,6 +4191,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4211,7 +4234,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4810,6 +4835,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4891,6 +4917,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4943,6 +4970,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5134,6 +5162,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5199,6 +5228,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5310,6 +5340,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5390,6 +5421,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5581,6 +5613,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5756,6 +5789,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5765,6 +5799,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5773,6 +5808,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5930,6 +5966,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6078,6 +6115,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6498,6 +6536,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -6754,6 +6793,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6853,6 +6893,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6868,6 +6909,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6934,6 +6976,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7125,6 +7168,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7224,6 +7268,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7371,6 +7417,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7399,6 +7446,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7435,6 +7483,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7652,8 +7701,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7720,6 +7773,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index ad66fe7f027..2fa74f7262d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -768,6 +768,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1095,6 +1096,7 @@ self: super: { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; @@ -1621,6 +1623,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1750,6 +1753,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1767,7 +1771,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2244,6 +2250,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2373,6 +2380,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2455,6 +2463,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2774,6 +2783,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3084,6 +3094,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3125,6 +3136,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3163,6 +3175,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3196,6 +3209,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3379,6 +3393,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3488,6 +3503,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3507,6 +3523,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3609,7 +3626,9 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_12"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; "haskell-token-utils" = dontDistribute super."haskell-token-utils"; "haskell-tor" = dontDistribute super."haskell-tor"; @@ -3827,6 +3846,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3880,6 +3900,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -4146,6 +4167,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4165,6 +4187,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4207,7 +4230,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4804,6 +4829,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4885,6 +4911,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4937,6 +4964,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5127,6 +5155,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5192,6 +5221,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5303,6 +5333,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5383,6 +5414,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5574,6 +5606,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5748,6 +5781,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5757,6 +5791,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5765,6 +5800,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5921,6 +5957,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6069,6 +6106,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6486,6 +6524,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -6742,6 +6781,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6841,6 +6881,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6856,6 +6897,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6921,6 +6963,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7110,6 +7153,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7208,6 +7252,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7355,6 +7401,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7383,6 +7430,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7419,6 +7467,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7636,8 +7685,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7704,6 +7757,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 261627066da..279cfaedde9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -766,6 +766,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1093,6 +1094,7 @@ self: super: { "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-extra" = doDistribute super."aeson-extra_0_2_2_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; @@ -1617,6 +1619,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1745,6 +1748,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1762,7 +1766,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2236,6 +2242,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2365,6 +2372,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2446,6 +2454,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2765,6 +2774,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3075,6 +3085,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3116,6 +3127,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3154,6 +3166,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3187,6 +3200,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; "goatee" = dontDistribute super."goatee"; @@ -3370,6 +3384,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3478,6 +3493,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3497,6 +3513,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3599,7 +3616,9 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_12"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; "haskell-token-utils" = dontDistribute super."haskell-token-utils"; "haskell-tor" = dontDistribute super."haskell-tor"; @@ -3817,6 +3836,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -3870,6 +3890,7 @@ self: super: { "hlibBladeRF" = dontDistribute super."hlibBladeRF"; "hlibev" = dontDistribute super."hlibev"; "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; "hlogger" = dontDistribute super."hlogger"; "hlongurl" = dontDistribute super."hlongurl"; "hls" = dontDistribute super."hls"; @@ -3983,6 +4004,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_9"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4135,6 +4157,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4154,6 +4177,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4196,7 +4220,9 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; + "http-api-data" = doDistribute super."http-api-data_0_2_1"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4791,6 +4817,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4871,6 +4898,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4923,6 +4951,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5113,6 +5142,7 @@ self: super: { "monad-gen" = dontDistribute super."monad-gen"; "monad-interleave" = dontDistribute super."monad-interleave"; "monad-levels" = dontDistribute super."monad-levels"; + "monad-logger" = doDistribute super."monad-logger_0_3_15"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5177,6 +5207,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5288,6 +5319,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5368,6 +5400,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5559,6 +5592,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5731,6 +5765,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5740,6 +5775,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5748,6 +5784,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5903,6 +5940,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -5920,6 +5958,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_9"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_9"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6049,6 +6089,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6465,6 +6506,7 @@ self: super: { "servant-cassava" = dontDistribute super."servant-cassava"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -6523,6 +6565,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4_1"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6720,6 +6763,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6791,6 +6835,7 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_10_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -6818,6 +6863,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6833,6 +6879,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -6898,6 +6945,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7087,6 +7135,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_4"; "texrunner" = dontDistribute super."texrunner"; "text-and-plots" = dontDistribute super."text-and-plots"; "text-format-simple" = dontDistribute super."text-format-simple"; @@ -7185,6 +7234,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7332,6 +7383,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7360,6 +7412,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7396,6 +7449,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7612,8 +7666,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7679,6 +7737,7 @@ self: super: { "webcrank-wai" = dontDistribute super."webcrank-wai"; "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix new file mode 100644 index 00000000000..d4b51cdc561 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -0,0 +1,8030 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.18 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet" = doDistribute super."HaskellNet_0_4_5"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdajudge" = dontDistribute super."Lambdajudge"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "RSA" = doDistribute super."RSA_2_1_0_3"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "ad" = doDistribute super."ad_4_2_4"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_4"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "alga" = dontDistribute super."alga"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-apigateway" = dontDistribute super."amazonka-apigateway"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-inspector" = dontDistribute super."amazonka-inspector"; + "amazonka-iot" = dontDistribute super."amazonka-iot"; + "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-waf" = dontDistribute super."amazonka-waf"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apply-refact" = dontDistribute super."apply-refact"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; + "argon" = dontDistribute super."argon"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "atp-haskell" = dontDistribute super."atp-haskell"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blake2" = dontDistribute super."blake2"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "buffon" = dontDistribute super."buffon"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "cacophony" = dontDistribute super."cacophony"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; + "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cayley-dickson" = dontDistribute super."cayley-dickson"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clang-pure" = dontDistribute super."clang-pure"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_15"; + "clash-lib" = doDistribute super."clash-lib_0_5_13"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_3"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_10"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_3_0_10"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "composition-tree" = dontDistribute super."composition-tree"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-output" = dontDistribute super."concurrent-output"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; + "consumers" = dontDistribute super."consumers"; + "container" = dontDistribute super."container"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "contravariant-extras" = dontDistribute super."contravariant-extras"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cubicspline" = doDistribute super."cubicspline_0_1_1"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-construction" = dontDistribute super."data-construction"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layer" = dontDistribute super."data-layer"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "declarative" = dontDistribute super."declarative"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-gestalt" = dontDistribute super."diff-gestalt"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "dixi" = dontDistribute super."dixi"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "double-metaphone" = dontDistribute super."double-metaphone"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumerate" = dontDistribute super."enumerate"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exact-real" = dontDistribute super."exact-real"; + "exception-hierarchy" = dontDistribute super."exception-hierarchy"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-maybe" = dontDistribute super."flat-maybe"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = dontDistribute super."fn"; + "fn-extra" = dontDistribute super."fn-extra"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; + "forth-hll" = dontDistribute super."forth-hll"; + "foscam-directory" = dontDistribute super."foscam-directory"; + "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-concurrent" = dontDistribute super."free-concurrent"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freenect" = doDistribute super."freenect_1_2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functional-kmp" = dontDistribute super."functional-kmp"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functor-utils" = dontDistribute super."functor-utils"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-deriving" = doDistribute super."generic-deriving_1_8_0"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geo-uk" = dontDistribute super."geo-uk"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-session" = dontDistribute super."ghc-session"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-fmt" = dontDistribute super."git-fmt"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "grouped-list" = dontDistribute super."grouped-list"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hScraper" = dontDistribute super."hScraper"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handa-opengl" = dontDistribute super."handa-opengl"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-tor" = dontDistribute super."haskell-tor"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskintex" = doDistribute super."haskintex_0_5_1_0"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-core" = dontDistribute super."haskoin-core"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-node" = dontDistribute super."haskoin-node"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_5_5"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger" = doDistribute super."hledger_0_26"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-lib" = doDistribute super."hledger-lib_0_26"; + "hledger-ui" = dontDistribute super."hledger-ui"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = doDistribute super."hledger-web_0_26"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlint" = doDistribute super."hlint_1_9_22"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix" = doDistribute super."hmatrix_0_16_1_5"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3"; + "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsignal" = doDistribute super."hsignal_0_2_7_1"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstatistics" = doDistribute super."hstatistics_0_2_5_2"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_0_4"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huckleberry" = dontDistribute super."huckleberry"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hworker" = dontDistribute super."hworker"; + "hworker-ses" = dontDistribute super."hworker-ses"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = doDistribute super."hyperloglog_0_3_4"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "ical" = dontDistribute super."ical"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jose-jwt" = doDistribute super."jose-jwt_0_6_2"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens" = doDistribute super."lens_4_12_3"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lens-utils" = dontDistribute super."lens-utils"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libinfluxdb" = dontDistribute super."libinfluxdb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lift-generics" = dontDistribute super."lift-generics"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_19_1_3"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup" = doDistribute super."markup_1_1_0"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcmc-types" = dontDistribute super."mcmc-types"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = dontDistribute super."megaparsec"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mighty-metropolis" = dontDistribute super."mighty-metropolis"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_9_3"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = dontDistribute super."mwc-probability"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats" = doDistribute super."nats_1"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-composed" = dontDistribute super."network-transport-composed"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-browser" = dontDistribute super."open-browser"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_3_3"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; + "path-extra" = dontDistribute super."path-extra"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "pathwalk" = dontDistribute super."pathwalk"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cacophony" = dontDistribute super."pipes-cacophony"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; + "plivo" = dontDistribute super."plivo"; + "plot" = doDistribute super."plot_0_2_3_4"; + "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-connector" = dontDistribute super."postgresql-connector"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefix-units" = doDistribute super."prefix-units_0_1_0_2"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-editor" = dontDistribute super."read-editor"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection" = doDistribute super."reflection_2"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa" = doDistribute super."repa_3_4_0_1"; + "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-io" = doDistribute super."repa-io_3_4_0_1"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_36_0_6"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; + "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8"; + "rest-snap" = doDistribute super."rest-snap_0_1_17_18"; + "rest-wai" = doDistribute super."rest-wai_0_1_0_8"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "second-transfer" = doDistribute super."second-transfer_0_6_1_0"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups" = doDistribute super."semigroups_0_16_2_2"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; + "servant-yaml" = dontDistribute super."servant-yaml"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplest-sqlite" = dontDistribute super."simplest-sqlite"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "singletons" = doDistribute super."singletons_1_1_2_1"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "speedy-slice" = dontDistribute super."speedy-slice"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_10_0"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-core" = dontDistribute super."stripe-core"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "success" = dontDistribute super."success"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swagger2" = dontDistribute super."swagger2"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tateti-tateti" = dontDistribute super."tateti-tateti"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-postgresql" = dontDistribute super."text-postgresql"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-cas" = dontDistribute super."th-cas"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-orphans" = doDistribute super."th-orphans_0_12_2"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; + "timemap" = dontDistribute super."timemap"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treersec" = dontDistribute super."treersec"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_5"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-list" = doDistribute super."type-list_0_2_0_0"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urlpath" = doDistribute super."urlpath_2_1_0"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector" = doDistribute super."vector_0_10_12_3"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_3_1"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_3"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_3_1"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "withdependencies" = dontDistribute super."withdependencies"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-csp" = dontDistribute super."yesod-csp"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; + "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; + "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zim-parser" = dontDistribute super."zim-parser"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipkin" = dontDistribute super."zipkin"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 631da53ead6..7f3faa96206 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -777,6 +777,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1647,6 +1648,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1779,6 +1781,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1796,7 +1799,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2289,6 +2294,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2419,6 +2425,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2511,6 +2518,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2840,6 +2848,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3159,6 +3168,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3201,6 +3211,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3241,6 +3252,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3274,6 +3286,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3459,6 +3472,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3589,6 +3603,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3694,6 +3709,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3917,6 +3933,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4241,6 +4258,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4260,6 +4278,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4916,6 +4935,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4998,6 +5018,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5051,6 +5072,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5316,6 +5338,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5511,6 +5534,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5705,6 +5729,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5888,6 +5913,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = doDistribute super."pipes-text_0_0_0_16"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5897,6 +5923,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5905,6 +5932,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6069,6 +6097,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6221,6 +6250,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6647,6 +6677,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6912,6 +6943,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7013,6 +7045,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7028,6 +7061,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7398,6 +7432,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7548,6 +7584,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7576,6 +7613,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7612,6 +7650,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7836,6 +7875,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7909,6 +7951,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 55cf748dfe5..0818d564b15 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -777,6 +777,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1646,6 +1647,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1778,6 +1780,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1795,7 +1798,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2285,6 +2290,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2415,6 +2421,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2507,6 +2514,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2836,6 +2844,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3154,6 +3163,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3196,6 +3206,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3236,6 +3247,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3269,6 +3281,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3454,6 +3467,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3584,6 +3598,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3689,6 +3704,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3912,6 +3928,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4234,6 +4251,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4253,6 +4271,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4909,6 +4928,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4991,6 +5011,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5044,6 +5065,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5309,6 +5331,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5421,6 +5444,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5503,6 +5527,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5697,6 +5722,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5880,6 +5906,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = doDistribute super."pipes-text_0_0_0_16"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5889,6 +5916,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5897,6 +5925,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6061,6 +6090,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6213,6 +6243,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6638,6 +6669,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6902,6 +6934,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7003,6 +7036,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7018,6 +7052,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7387,6 +7422,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7537,6 +7574,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7565,6 +7603,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7601,6 +7640,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7824,6 +7864,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7897,6 +7940,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index cd1858c1774..dc22d5aa5bf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -777,6 +777,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1646,6 +1647,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1778,6 +1780,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1795,7 +1798,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2284,6 +2289,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2414,6 +2420,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2506,6 +2513,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2835,6 +2843,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3153,6 +3162,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3195,6 +3205,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3235,6 +3246,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3268,6 +3280,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3453,6 +3466,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3583,6 +3597,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3688,6 +3703,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3911,6 +3927,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4233,6 +4250,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4252,6 +4270,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4908,6 +4927,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4990,6 +5010,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5043,6 +5064,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5308,6 +5330,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5420,6 +5443,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5502,6 +5526,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5696,6 +5721,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5879,6 +5905,7 @@ self: super: { "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; "pipes-text" = doDistribute super."pipes-text_0_0_0_16"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5888,6 +5915,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5896,6 +5924,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6060,6 +6089,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6212,6 +6242,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6636,6 +6667,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6900,6 +6932,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -7000,6 +7033,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -7015,6 +7049,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7384,6 +7419,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7534,6 +7571,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7562,6 +7600,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7598,6 +7637,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7821,6 +7861,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7893,6 +7936,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index c9b18487c15..ad76072710f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -777,6 +777,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1645,6 +1646,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1777,6 +1779,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1794,7 +1797,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2281,6 +2286,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2411,6 +2417,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2503,6 +2510,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2832,6 +2840,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3148,6 +3157,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3190,6 +3200,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3230,6 +3241,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3263,6 +3275,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3448,6 +3461,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3578,6 +3592,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3682,6 +3697,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3904,6 +3920,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4225,6 +4242,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4244,6 +4262,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4897,6 +4916,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4978,6 +4998,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5031,6 +5052,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5296,6 +5318,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5407,6 +5430,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5489,6 +5513,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5683,6 +5708,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5864,6 +5890,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5873,6 +5900,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5881,6 +5909,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6043,6 +6072,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6195,6 +6225,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6619,6 +6650,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6882,6 +6914,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6982,6 +7015,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6997,6 +7031,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7363,6 +7398,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7513,6 +7550,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7541,6 +7579,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7577,6 +7616,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7800,6 +7840,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7872,6 +7915,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 82a4183307a..a8f64fef71b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -777,6 +777,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1644,6 +1645,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1776,6 +1778,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1793,7 +1796,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2279,6 +2284,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2409,6 +2415,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2501,6 +2508,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2828,6 +2836,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3143,6 +3152,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3185,6 +3195,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3223,6 +3234,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3256,6 +3268,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3441,6 +3454,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3551,6 +3565,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3570,6 +3585,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3674,6 +3690,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3896,6 +3913,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4217,6 +4235,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4236,6 +4255,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4885,6 +4905,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4966,6 +4987,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5019,6 +5041,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5283,6 +5306,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5394,6 +5418,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5476,6 +5501,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5670,6 +5696,7 @@ self: super: { "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5850,6 +5877,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5859,6 +5887,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5867,6 +5896,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6029,6 +6059,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6181,6 +6212,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6605,6 +6637,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6868,6 +6901,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6968,6 +7002,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6983,6 +7018,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7349,6 +7385,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7498,6 +7536,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7526,6 +7565,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7562,6 +7602,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7784,6 +7825,9 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_1_2"; @@ -7855,6 +7899,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 701852f4484..157dcb22bfa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -776,6 +776,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1639,6 +1640,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1771,6 +1773,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1788,7 +1791,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2273,6 +2278,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2403,6 +2409,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2494,6 +2501,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2821,6 +2829,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3134,6 +3143,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3176,6 +3186,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3214,6 +3225,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3247,6 +3259,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3432,6 +3445,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3542,6 +3556,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3561,6 +3576,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3665,6 +3681,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_10"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3885,6 +3902,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4206,6 +4224,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4225,6 +4244,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4270,6 +4290,7 @@ self: super: { "http-accept" = dontDistribute super."http-accept"; "http-api-data" = dontDistribute super."http-api-data"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4872,6 +4893,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4953,6 +4975,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -5006,6 +5029,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5268,6 +5292,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5379,6 +5404,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5461,6 +5487,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5654,6 +5681,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5834,6 +5862,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5843,6 +5872,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5851,6 +5881,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -6011,6 +6042,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6161,6 +6193,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6585,6 +6618,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6847,6 +6881,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6946,6 +6981,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6961,6 +6997,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7327,6 +7364,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7475,6 +7514,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7503,6 +7543,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7539,6 +7580,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7761,8 +7803,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7831,6 +7877,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 8886aa895e7..900e14b8aef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -776,6 +776,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1636,6 +1637,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1768,6 +1770,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1785,7 +1788,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2267,6 +2272,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2397,6 +2403,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2483,6 +2490,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2810,6 +2818,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3123,6 +3132,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3165,6 +3175,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3203,6 +3214,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3236,6 +3248,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3421,6 +3434,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3531,6 +3545,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3550,6 +3565,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3654,6 +3670,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3874,6 +3891,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4195,6 +4213,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4214,6 +4233,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4259,6 +4279,7 @@ self: super: { "http-accept" = dontDistribute super."http-accept"; "http-api-data" = dontDistribute super."http-api-data"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4861,6 +4882,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4942,6 +4964,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4995,6 +5018,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5255,6 +5279,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5366,6 +5391,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5448,6 +5474,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5641,6 +5668,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5821,6 +5849,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5830,6 +5859,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5838,6 +5868,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5996,6 +6027,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6145,6 +6177,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6569,6 +6602,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6831,6 +6865,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6930,6 +6965,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6945,6 +6981,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7011,6 +7048,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7309,6 +7347,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7457,6 +7497,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7485,6 +7526,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7521,6 +7563,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7743,8 +7786,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7813,6 +7860,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index e57c1488001..66de270065c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -774,6 +774,7 @@ self: super: { "QIO" = dontDistribute super."QIO"; "QuadEdge" = dontDistribute super."QuadEdge"; "QuadTree" = dontDistribute super."QuadTree"; + "Quelea" = dontDistribute super."Quelea"; "QuickAnnotate" = dontDistribute super."QuickAnnotate"; "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; "Quickson" = dontDistribute super."Quickson"; @@ -1633,6 +1634,7 @@ self: super: { "blunt" = dontDistribute super."blunt"; "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; + "bond" = dontDistribute super."bond"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1764,6 +1766,7 @@ self: super: { "caf" = dontDistribute super."caf"; "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; "caffegraph" = dontDistribute super."caffegraph"; + "cairo" = doDistribute super."cairo_0_13_1_0"; "cairo-appbase" = dontDistribute super."cairo-appbase"; "cake" = dontDistribute super."cake"; "cake3" = dontDistribute super."cake3"; @@ -1781,7 +1784,9 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; "cap" = dontDistribute super."cap"; @@ -2263,6 +2268,7 @@ self: super: { "data-dword" = dontDistribute super."data-dword"; "data-easy" = dontDistribute super."data-easy"; "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; "data-fin" = dontDistribute super."data-fin"; @@ -2392,6 +2398,7 @@ self: super: { "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; + "derive" = doDistribute super."derive_2_5_22"; "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; @@ -2478,6 +2485,7 @@ self: super: { "disjoint-set" = dontDistribute super."disjoint-set"; "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; "dist-upload" = dontDistribute super."dist-upload"; + "distributed-closure" = dontDistribute super."distributed-closure"; "distributed-process" = dontDistribute super."distributed-process"; "distributed-process-async" = dontDistribute super."distributed-process-async"; "distributed-process-azure" = dontDistribute super."distributed-process-azure"; @@ -2803,6 +2811,7 @@ self: super: { "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; "fault-tree" = dontDistribute super."fault-tree"; + "fay" = doDistribute super."fay_0_23_1_8"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; @@ -3115,6 +3124,7 @@ self: super: { "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; @@ -3157,6 +3167,7 @@ self: super: { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gio" = doDistribute super."gio_0_13_1_0"; "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; @@ -3195,6 +3206,7 @@ self: super: { "glambda" = dontDistribute super."glambda"; "glapp" = dontDistribute super."glapp"; "glasso" = dontDistribute super."glasso"; + "glib" = doDistribute super."glib_0_13_2_1"; "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; @@ -3228,6 +3240,7 @@ self: super: { "gnome-desktop" = dontDistribute super."gnome-desktop"; "gnome-keyring" = dontDistribute super."gnome-keyring"; "gnomevfs" = dontDistribute super."gnomevfs"; + "gnss-converters" = dontDistribute super."gnss-converters"; "gnuidn" = doDistribute super."gnuidn_0_2_1"; "gnuplot" = dontDistribute super."gnuplot"; "goa" = dontDistribute super."goa"; @@ -3413,6 +3426,7 @@ self: super: { "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3" = doDistribute super."gtk3_0_14_1"; "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; "gtkglext" = dontDistribute super."gtkglext"; "gtkimageview" = dontDistribute super."gtkimageview"; @@ -3523,6 +3537,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_1"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3542,6 +3557,7 @@ self: super: { "hans" = dontDistribute super."hans"; "hans-pcap" = dontDistribute super."hans-pcap"; "hans-pfq" = dontDistribute super."hans-pfq"; + "haphviz" = dontDistribute super."haphviz"; "hapistrano" = dontDistribute super."hapistrano"; "happindicator" = dontDistribute super."happindicator"; "happindicator3" = dontDistribute super."happindicator3"; @@ -3646,6 +3662,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3866,6 +3883,7 @@ self: super: { "highlight-versions" = dontDistribute super."highlight-versions"; "highlighter" = dontDistribute super."highlighter"; "highlighter2" = dontDistribute super."highlighter2"; + "highlighting-kate" = doDistribute super."highlighting-kate_0_6"; "hills" = dontDistribute super."hills"; "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; @@ -4187,6 +4205,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-wai" = doDistribute super."hspec-wai_0_6_3"; "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; "hspec2" = dontDistribute super."hspec2"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4206,6 +4225,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; "hssqlppp" = dontDistribute super."hssqlppp"; @@ -4251,6 +4271,7 @@ self: super: { "http-accept" = dontDistribute super."http-accept"; "http-api-data" = dontDistribute super."http-api-data"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_24"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4853,6 +4874,7 @@ self: super: { "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; "linebreak" = dontDistribute super."linebreak"; "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "link-relations" = dontDistribute super."link-relations"; "linkchk" = dontDistribute super."linkchk"; "linkcore" = dontDistribute super."linkcore"; "linkedhashmap" = dontDistribute super."linkedhashmap"; @@ -4934,6 +4956,7 @@ self: super: { "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; "logsink" = dontDistribute super."logsink"; "lojban" = dontDistribute super."lojban"; "lojbanParser" = dontDistribute super."lojbanParser"; @@ -4987,6 +5010,7 @@ self: super: { "mac" = dontDistribute super."mac"; "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; + "machines-binary" = dontDistribute super."machines-binary"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5247,6 +5271,7 @@ self: super: { "mpdmate" = dontDistribute super."mpdmate"; "mpppc" = dontDistribute super."mpppc"; "mpretty" = dontDistribute super."mpretty"; + "mpris" = dontDistribute super."mpris"; "mprover" = dontDistribute super."mprover"; "mps" = dontDistribute super."mps"; "mpvguihs" = dontDistribute super."mpvguihs"; @@ -5358,6 +5383,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5440,6 +5466,7 @@ self: super: { "nextstep-plist" = dontDistribute super."nextstep-plist"; "nf" = dontDistribute super."nf"; "ngrams-loader" = dontDistribute super."ngrams-loader"; + "niagra" = dontDistribute super."niagra"; "nibblestring" = dontDistribute super."nibblestring"; "nicify" = dontDistribute super."nicify"; "nicify-lib" = dontDistribute super."nicify-lib"; @@ -5632,6 +5659,7 @@ self: super: { "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "pango" = doDistribute super."pango_0_13_1_0"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; "para" = dontDistribute super."para"; @@ -5812,6 +5840,7 @@ self: super: { "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-shell" = dontDistribute super."pipes-shell"; "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-transduce" = dontDistribute super."pipes-transduce"; "pipes-vector" = dontDistribute super."pipes-vector"; "pipes-websockets" = dontDistribute super."pipes-websockets"; "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; @@ -5821,6 +5850,7 @@ self: super: { "pitchtrack" = dontDistribute super."pitchtrack"; "pivotal-tracker" = dontDistribute super."pivotal-tracker"; "pkcs1" = dontDistribute super."pkcs1"; + "pkcs10" = dontDistribute super."pkcs10"; "pkcs7" = dontDistribute super."pkcs7"; "pkggraph" = dontDistribute super."pkggraph"; "pktree" = dontDistribute super."pktree"; @@ -5829,6 +5859,7 @@ self: super: { "plat" = dontDistribute super."plat"; "playlists" = dontDistribute super."playlists"; "plist" = dontDistribute super."plist"; + "plist-buddy" = dontDistribute super."plist-buddy"; "plivo" = dontDistribute super."plivo"; "plot" = doDistribute super."plot_0_2_3_4"; "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; @@ -5987,6 +6018,7 @@ self: super: { "progressive" = dontDistribute super."progressive"; "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; "projection" = dontDistribute super."projection"; + "projectroot" = dontDistribute super."projectroot"; "prolog" = dontDistribute super."prolog"; "prolog-graph" = dontDistribute super."prolog-graph"; "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; @@ -6136,6 +6168,7 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6560,6 +6593,7 @@ self: super: { "servant-docs" = doDistribute super."servant-docs_0_4_4_4"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -6822,6 +6856,7 @@ self: super: { "sound-collage" = dontDistribute super."sound-collage"; "sounddelay" = dontDistribute super."sounddelay"; "source-code-server" = dontDistribute super."source-code-server"; + "sourcemap" = doDistribute super."sourcemap_0_1_3_0"; "sousit" = dontDistribute super."sousit"; "sox" = dontDistribute super."sox"; "soxlib" = dontDistribute super."soxlib"; @@ -6921,6 +6956,7 @@ self: super: { "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; "stats" = dontDistribute super."stats"; "statsd" = dontDistribute super."statsd"; + "statsd-client" = dontDistribute super."statsd-client"; "statsd-datadog" = dontDistribute super."statsd-datadog"; "statvfs" = dontDistribute super."statvfs"; "stb-image" = dontDistribute super."stb-image"; @@ -6936,6 +6972,7 @@ self: super: { "stitch" = dontDistribute super."stitch"; "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-conduit" = doDistribute super."stm-conduit_2_6_1"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7002,6 +7039,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7300,6 +7338,8 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; @@ -7448,6 +7488,7 @@ self: super: { "type-booleans" = dontDistribute super."type-booleans"; "type-cereal" = dontDistribute super."type-cereal"; "type-combinators" = dontDistribute super."type-combinators"; + "type-combinators-quote" = dontDistribute super."type-combinators-quote"; "type-digits" = dontDistribute super."type-digits"; "type-equality" = dontDistribute super."type-equality"; "type-equality-check" = dontDistribute super."type-equality-check"; @@ -7476,6 +7517,7 @@ self: super: { "typeable-th" = dontDistribute super."typeable-th"; "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; "typed-wire" = dontDistribute super."typed-wire"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; "typedquery" = dontDistribute super."typedquery"; "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; @@ -7512,6 +7554,7 @@ self: super: { "unbound" = dontDistribute super."unbound"; "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unbreak" = dontDistribute super."unbreak"; "unexceptionalio" = dontDistribute super."unexceptionalio"; "unfoldable" = dontDistribute super."unfoldable"; "ungadtagger" = dontDistribute super."ungadtagger"; @@ -7734,8 +7777,12 @@ self: super: { "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-caching" = dontDistribute super."wai-middleware-caching"; + "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru"; + "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_2_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7804,6 +7851,7 @@ self: super: { "webdriver" = doDistribute super."webdriver_0_6_3_1"; "webdriver-angular" = doDistribute super."webdriver-angular_0_1_7"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; "webkit" = dontDistribute super."webkit"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 16ad44023b7..f1a0e64c4e9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -747,6 +747,7 @@ self: { libraryToolDepends = [ alex cpphs happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; + jailbreak = true; postInstall = '' $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda) $out/bin/agda-mode compile @@ -7372,20 +7373,19 @@ self: { }) {}; "HDBC-odbc" = callPackage - ({ mkDerivation, base, bytestring, HDBC, mtl, time, unixODBC - , utf8-string + ({ mkDerivation, base, bytestring, concurrent-extra, HDBC, mtl + , time, unixODBC, utf8-string }: mkDerivation { pname = "HDBC-odbc"; - version = "2.4.0.1"; - sha256 = "dbc6eecc122079ca396c86154bfe59553d65bea52f83f8c0630903f2292daee9"; + version = "2.5.0.0"; + sha256 = "729982fb31e2d7816e8600212236f32d9d9a59191d73ce57fce097be2234953b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring HDBC mtl time utf8-string + base bytestring concurrent-extra HDBC mtl time utf8-string ]; librarySystemDepends = [ unixODBC ]; - executableSystemDepends = [ unixODBC ]; homepage = "https://github.com/hdbc/hdbc-odbc"; description = "ODBC driver for HDBC"; license = stdenv.lib.licenses.bsd3; @@ -10048,8 +10048,8 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.3.2"; - sha256 = "b7a7101f0b27c0917ca8f1e4a9777735d86ffd05bf258ddef650a967e67d4735"; + version = "0.3.3"; + sha256 = "2ae2eed3c528a0c8ae9a797cddb66d64ddb5443d43181b00c90ab2ee9e0ef88d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15177,6 +15177,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Quelea" = callPackage + ({ mkDerivation, base, bytestring, cassandra-cql, cereal + , containers, derive, directory, lens, mtl, optparse-applicative + , process, random, template-haskell, text, time, transformers + , tuple, unix, uuid, z3, zeromq4-haskell + }: + mkDerivation { + pname = "Quelea"; + version = "1.0.0"; + sha256 = "b30b6516160a7d3ab9db3c1341b69c35f0a9230ac23bb819a7b42be48a67d7e3"; + libraryHaskellDepends = [ + base bytestring cassandra-cql cereal containers derive directory + lens mtl optparse-applicative process random template-haskell text + time transformers tuple unix uuid z3 zeromq4-haskell + ]; + homepage = "http://gowthamk.github.io/Quelea"; + description = "Programming with Eventual Consistency over Cassandra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QuickAnnotate" = callPackage ({ mkDerivation, base, haskell-src-exts }: mkDerivation { @@ -16158,16 +16178,17 @@ self: { }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.0.1"; - sha256 = "8311da5762464cba671f5f2225d0777180d805f0b429ac5824ae2f9f4416c7ab"; + version = "0.6.0.2"; + sha256 = "ab0035335a2193d8fd3e468bc2e5ba74b086516b62bad35415153606a2770dc5"; libraryHaskellDepends = [ base SDL ]; + librarySystemDepends = [ SDL_gfx ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; + }) {inherit (pkgs) SDL_gfx;}; "SDL-image" = callPackage ({ mkDerivation, base, SDL, SDL_image }: @@ -16213,16 +16234,17 @@ self: { }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, SDL, SDL_ttf }: mkDerivation { pname = "SDL-ttf"; - version = "0.6.2.1"; - sha256 = "3a9d43e99b85813aad4f6e731ed0cd01b8d9f3a4dfff51ec6143b3fc6428a5d1"; + version = "0.6.2.2"; + sha256 = "1621e4f1262f0c63aef84e02a9f53515ddcc4fce92a50d6954d947598a527499"; libraryHaskellDepends = [ base SDL ]; + librarySystemDepends = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; + }) {inherit (pkgs) SDL_ttf;}; "SDL2-ttf" = callPackage ({ mkDerivation, base, SDL2, SDL2_ttf }: @@ -16605,17 +16627,17 @@ self: { }) {}; "SciFlow" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, lens, mtl - , optparse-applicative, shelly, split, template-haskell, text - , th-lift, unordered-containers, yaml + ({ mkDerivation, base, bytestring, containers, data-default-class + , fgl, graphviz, lens, mtl, optparse-applicative, shelly, split + , template-haskell, text, th-lift, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.3.0"; - sha256 = "f23c90f2708edde150c16eff8692ac8cd47bbf2455aaa355c0546e1f9cb0becf"; + version = "0.4.0"; + sha256 = "6ab39de90c8f4b31ee57ebab575db36d53ef1800895bc87cfa3b9d443807661b"; libraryHaskellDepends = [ - base bytestring data-default-class lens mtl optparse-applicative - shelly split template-haskell text th-lift unordered-containers + base bytestring containers data-default-class fgl graphviz lens mtl + optparse-applicative shelly split template-haskell text th-lift yaml ]; description = "Scientific workflow management system"; @@ -17118,6 +17140,7 @@ self: { base Cabal containers directory fgl filepath Graphalyze graphviz haskell-src-exts mtl multiset random ]; + jailbreak = true; description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; }) {}; @@ -20049,23 +20072,25 @@ self: { }) {}; "abcBridge" = callPackage - ({ mkDerivation, abc, aig, base, c2hs, containers, directory - , QuickCheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck - , vector + ({ mkDerivation, abc, aig, base, base-compat, c2hs, containers + , directory, QuickCheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, vector }: mkDerivation { pname = "abcBridge"; - version = "0.14"; - sha256 = "6e3a8abe9b398649d4584df9dec79a86e7dbd40e0fd1abd5be735854c08025ce"; + version = "0.15"; + sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aig base containers directory vector ]; + libraryHaskellDepends = [ + aig base base-compat containers directory vector + ]; librarySystemDepends = [ abc ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ - aig base directory QuickCheck tasty tasty-ant-xml tasty-hunit - tasty-quickcheck vector + aig base base-compat directory QuickCheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck vector ]; description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; @@ -21793,6 +21818,7 @@ self: { testHaskellDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th ]; + doHaddock = false; description = "Tools to change the formatting of field names in Aeson instances"; license = stdenv.lib.licenses.mit; }) {}; @@ -21852,7 +21878,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-extra" = callPackage + "aeson-extra_0_2_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , exceptions, hashable, quickcheck-instances, scientific, tasty , tasty-hunit, tasty-quickcheck, text, time, unordered-containers @@ -21874,9 +21900,10 @@ self: { homepage = "https://github.com/phadej/aeson-extra#readme"; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-extra_0_2_3_0" = callPackage + "aeson-extra" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , exceptions, hashable, quickcheck-instances, scientific, tasty , tasty-hunit, tasty-quickcheck, template-haskell, text, time @@ -21898,7 +21925,6 @@ self: { homepage = "https://github.com/phadej/aeson-extra#readme"; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-filthy" = callPackage @@ -21975,8 +22001,8 @@ self: { }: mkDerivation { pname = "aeson-parsec-picky"; - version = "0.1.0.0"; - sha256 = "bd5fa3ae9322fe1f486d52d046823d843538bf85204371a0ba17736412ea9cbc"; + version = "0.1.0.1"; + sha256 = "f617704188453e639d60ea9ac24d6c161affb517581cfff6dfbd2b580ccaea62"; libraryHaskellDepends = [ aeson base parsec scientific text unordered-containers vector ]; @@ -22287,8 +22313,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11"; - sha256 = "894b2465322aeb049857aca34f2c713289edfe9dc93d33df9a5d747862bca88f"; + version = "0.11.1"; + sha256 = "933a2111c21cc0f6e9869d6c4927b8201882a03c01de693e68d821f5d4484d49"; libraryHaskellDepends = [ aeson base-prelude mtl-prelude scientific success text unordered-containers vector @@ -22464,12 +22490,12 @@ self: { }) {}; "aig" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, vector }: + ({ mkDerivation, base, base-compat, mtl, QuickCheck, vector }: mkDerivation { pname = "aig"; - version = "0.2.3"; - sha256 = "f9f75a6df96defba1f34f0fbd7e8914b447c9fe5bb1aa96722df67eb4ae6c30c"; - libraryHaskellDepends = [ base mtl QuickCheck vector ]; + version = "0.2.4"; + sha256 = "ac0e06a707b7488de7e1f9d7b123703e2df14763f9e6448d67c4dd20ffdc88eb"; + libraryHaskellDepends = [ base base-compat mtl QuickCheck vector ]; description = "And-inverter graphs in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30651,6 +30677,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "auto-update_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "auto-update"; + version = "0.1.3"; + sha256 = "3d8e11271d9c0bacefd663143af60c530dd7483b70582bae56e64b6716891509"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/yesodweb/wai"; + description = "Efficiently run periodic, on-demand actions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autonix-deps" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit , containers, errors, filepath, lens, libarchive-conduit, mtl @@ -32386,6 +32425,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base-noprelude_4_8_2_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-noprelude"; + version = "4.8.2.0"; + sha256 = "bd4ab7685a14d82f7586074b1af88e22a8401e552a439286710592e3a2d763c7"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + jailbreak = true; + homepage = "https://github.com/hvr/base-noprelude"; + description = "\"base\" package sans \"Prelude\" module"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-orphans_0_4_3" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { @@ -32417,6 +32471,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_4_5" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: + mkDerivation { + pname = "base-orphans"; + version = "0.4.5"; + sha256 = "16b70764247f1545b76c51b1d93dfe98dc78076a710db777e213d61690053da7"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/haskell-compat/base-orphans#readme"; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude_0_1_6" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -34142,10 +34210,9 @@ self: { ({ mkDerivation, array, base, bytestring, containers, mtl }: mkDerivation { pname = "binary-strict"; - version = "0.4.8.2"; - sha256 = "67114486d3d29367c29814aed25291fe62b8ab2545576cde23b0e0cb0bc9d933"; + version = "0.4.8.3"; + sha256 = "8eb8fb5bd9fdae7bc39df27e3273bdf7e7903c88c517c5646616dd8f04a92cb1"; libraryHaskellDepends = [ array base bytestring containers mtl ]; - jailbreak = true; homepage = "https://github.com/idontgetoutmuch/binary-low-level"; description = "Binary deserialisation using strict ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -37075,6 +37142,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bond" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cmdargs, derive + , Diff, directory, filepath, HUnit, monad-loops, mtl, parsec + , pretty, process, QuickCheck, shakespeare, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "bond"; + version = "0.4.0.1"; + sha256 = "40d7f0ddcb4779d16ce3ce94bb0f0d2ea47d6d2c82f296027cd3d068be0622c8"; + revision = "1"; + editedCabalFile = "f90dcbaa3a55c1918957942c01f21a574c268730f37aff34c19a6cd04b4ccc6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring filepath mtl parsec shakespeare text + ]; + executableHaskellDepends = [ + aeson async base bytestring cmdargs directory filepath monad-loops + process text + ]; + testHaskellDepends = [ + aeson base bytestring cmdargs derive Diff directory filepath HUnit + monad-loops pretty QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + homepage = "https://github.com/Microsoft/bond"; + description = "Bond schema compiler and code generator"; + license = stdenv.lib.licenses.mit; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -37527,17 +37625,17 @@ self: { "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, Diff, lens, template-haskell, text, text-zipper - , transformers, vector, vty + , deepseq, lens, template-haskell, text, text-zipper, transformers + , vector, vty }: mkDerivation { pname = "brick"; - version = "0.2.3"; - sha256 = "4f9062ccc4cc4a9756cc1dcf057d96c8c4a587f0405d11fa75619555afe3b402"; + version = "0.3"; + sha256 = "86d37000d642b0a7bca0c820f7860fefc6a9383044149253e17a88ee4c69d491"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers contravariant data-default deepseq Diff lens + base containers contravariant data-default deepseq lens template-haskell text text-zipper transformers vector vty ]; executableHaskellDepends = [ @@ -38786,8 +38884,8 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.2"; - sha256 = "ba0177ecfd71e7370b2c57fb23de72b8bc65c7e0533599fbd5791af29ea79260"; + version = "0.2.2.1"; + sha256 = "7c63bedde6d0179d0c595fa14d0bfe46625e6fc089eb82675fe463ffa015286d"; libraryHaskellDepends = [ base base-prelude bytestring ]; testHaskellDepends = [ base-prelude bytestring QuickCheck quickcheck-instances tasty @@ -40446,8 +40544,8 @@ self: { ({ mkDerivation, base, stm, time }: mkDerivation { pname = "cached-io"; - version = "0.1.0.1"; - sha256 = "76326e5acec346f27c258440b792e4899c6fb2fc364b1c217c73c5b72e3ce0b8"; + version = "0.1.1.0"; + sha256 = "b43e7b329aff4a1f96daff221b6e68b7124d35cef3331034b452d794c8b03546"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm time ]; @@ -40578,7 +40676,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; - "cairo" = callPackage + "cairo_0_13_1_0" = callPackage ({ mkDerivation, array, base, bytestring, cairo, gtk2hs-buildtools , mtl, text, utf8-string }: @@ -40594,6 +40692,25 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + + "cairo" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, gtk2hs-buildtools + , mtl, text, utf8-string + }: + mkDerivation { + pname = "cairo"; + version = "0.13.1.1"; + sha256 = "58ae22451e7812a88531eaf91ae1250c277f48d0a88d1cae2438bd76f79e89f6"; + libraryHaskellDepends = [ + array base bytestring mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -40906,22 +41023,54 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "canteven-listen-http" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "canteven-listen-http"; + version = "0.1.0.0"; + sha256 = "b7a750e3cf9c1aa7bac89c631714546aea477f3b5a5672dd3df7bb1e2513e168"; + libraryHaskellDepends = [ aeson base ]; + jailbreak = true; + description = "data types to describe HTTP services"; + license = stdenv.lib.licenses.asl20; + }) {}; + "canteven-log" = callPackage - ({ mkDerivation, aeson, base, canteven-config, directory, filepath - , hslogger, text, yaml + ({ mkDerivation, aeson, base, bytestring, canteven-config + , directory, fast-logger, filepath, hslogger, monad-logger + , template-haskell, text, time, transformers, yaml }: mkDerivation { pname = "canteven-log"; - version = "0.2.0.0"; - sha256 = "ce6d0e147e0e2b008f6c225997955670f5e781eed7fda40d609cc4ef078bee95"; + version = "0.3.0.2"; + sha256 = "296cc4329510c766b973d98c2e6f1186404df46eaf0f10f53fec432a3a5a3379"; libraryHaskellDepends = [ - aeson base canteven-config directory filepath hslogger text yaml + aeson base bytestring canteven-config directory fast-logger + filepath hslogger monad-logger template-haskell text time + transformers yaml ]; homepage = "https://github.com/SumAll/haskell-canteven-log"; description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; }) {}; + "canteven-template" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, data-default + , markdown, template-haskell, text + }: + mkDerivation { + pname = "canteven-template"; + version = "0.1.0.0"; + sha256 = "c9c1e542c81288537211ed6d80c0cdc53bd1ec8967146337a2a2364286acc586"; + libraryHaskellDepends = [ + base blaze-html bytestring data-default markdown template-haskell + text + ]; + homepage = "https://github.com/SumAll/haskell-canteven-template/"; + description = "A few utilites and helpers for using Template Haskell in your projects"; + license = stdenv.lib.licenses.asl20; + }) {}; + "cantor" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, hspec, hxt, hxt-xpath, parsec, QuickCheck, split @@ -41961,8 +42110,8 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.18.2"; - sha256 = "d5511174340ac9723d40f70a3382c4e789b5183f4133657c343b380ea1221a98"; + version = "0.19.0"; + sha256 = "4608d1b3437c3dd00310b7accf53c1d904eb0390feec25075ad2bdef3ab01a19"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42233,8 +42382,8 @@ self: { }: mkDerivation { pname = "cereal-plus"; - version = "0.4.0"; - sha256 = "ecc667407b9aa3eace4a2f65b0ef4a76f380df988cbb92a2cec8d0059b273e81"; + version = "0.4.1"; + sha256 = "696f8a279e6c38c70c1b821565398b850c602464fba909ab3ce7c30b4b14e492"; libraryHaskellDepends = [ array base bytestring cereal containers errors hashable hashtables mmorph mtl stm text time unordered-containers vector @@ -42244,7 +42393,6 @@ self: { HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/cereal-plus"; description = "An extended serialization library on top of \"cereal\""; license = stdenv.lib.licenses.mit; @@ -43462,8 +43610,8 @@ self: { ({ mkDerivation, array, base, bytestring, parseargs }: mkDerivation { pname = "ciphersaber2"; - version = "0.1.1.1"; - sha256 = "bb5d725c40858bccc30ed189d6bf39fb790a4fefed965d7b72fcbbe506e50b86"; + version = "0.1.1.2"; + sha256 = "d64c809fff4312d71cf93b462c76a4f23b763d95b70d305b1091f3d5d240efb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -43910,8 +44058,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.6.5"; - sha256 = "22f1b6329093eebb4490fe8ffcac650a8408c22fab7a3eedb3cbd6f3876aba52"; + version = "0.6.6"; + sha256 = "a01193e7552866b839ddc6d368f4cb0b04c2ba5eed2a92217cad23024bdf5718"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44027,8 +44175,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.6.5"; - sha256 = "62921cc650ac7bda7c5b29861f02026d4b4d7a6d33d2efe11de52f0b422d8104"; + version = "0.6.6"; + sha256 = "a40e5cc300a84e61b7ed47a104914715e77795b18bd97f9489ddbca8efc92cd5"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -44091,8 +44239,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.10.3"; - sha256 = "4049c115c7b38ddf893e860556dbe29543ae729a0d288cc651739b6ef6d5ebfb"; + version = "0.10.4"; + sha256 = "0e61217e0cb01a88daae477ce3dffb22c347cfa7165a09718bf8d51d6329e180"; libraryHaskellDepends = [ array base data-default ghc-prim ghc-typelits-extra ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection @@ -45626,6 +45774,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clock_0_6_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck }: + mkDerivation { + pname = "clock"; + version = "0.6.0.1"; + sha256 = "88a2c7cfe3edacb8775fa8e8e6fa6ff8ceceb45554c5d2d7fabefc8df52b5f74"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/corsis/clock"; + description = "High-resolution clock functions: monotonic, realtime, cputime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clocked" = callPackage ({ mkDerivation, base, clock, containers, MonadCatchIO-transformers , QtCore, transformers @@ -47815,6 +47977,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-extra_0_7_0_10" = callPackage + ({ mkDerivation, async, base, HUnit, random, stm, test-framework + , test-framework-hunit, unbounded-delays + }: + mkDerivation { + pname = "concurrent-extra"; + version = "0.7.0.10"; + sha256 = "6f27cc0a90f5f25b3c0a1e9e3c0e3b407538908c061c5b7da34461b76e1adc12"; + libraryHaskellDepends = [ base stm unbounded-delays ]; + testHaskellDepends = [ + async base HUnit random stm test-framework test-framework-hunit + unbounded-delays + ]; + homepage = "https://github.com/basvandijk/concurrent-extra"; + description = "Extra concurrency primitives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-machines" = callPackage ({ mkDerivation, async, base, containers, lifted-async, machines , monad-control, semigroups, tasty, tasty-hunit, time, transformers @@ -48890,21 +49071,21 @@ self: { "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, containers, either, hspec, hspec-discover, mtl - , pretty-show, QuickCheck, regex-easy, safe, scientific - , string-conversions, template-haskell, text, unordered-containers - , vector, yaml + , case-insensitive, containers, directory, either, functor-infix + , hspec, hspec-discover, mtl, pretty-show, QuickCheck, regex-easy + , safe, scientific, string-conversions, template-haskell, text + , unordered-containers, vector, yaml }: mkDerivation { pname = "configifier"; - version = "0.0.6"; - sha256 = "00b212fa919e3765224654886be2e78ba646396470dd1448fc8851852482e2b6"; + version = "0.0.7"; + sha256 = "207b6a5c670b44c0a7814ff7ab2054507df84d8b8ad8418c3fe312d7d1db1e30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring case-insensitive containers either mtl regex-easy - safe string-conversions template-haskell unordered-containers - vector yaml + base bytestring case-insensitive containers directory either + functor-infix mtl regex-easy safe string-conversions + template-haskell unordered-containers vector yaml ]; executableHaskellDepends = [ base bytestring mtl pretty-show string-conversions text yaml @@ -54271,6 +54452,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-extend-generic" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "data-extend-generic"; + version = "0.1.0.0"; + sha256 = "b5cf36c5ccf72a400bc8dca3a983c3a4b65a7788fbd07eca93e5b23dca27f1bd"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/githubuser/data-extend-generic#readme"; + description = "Extend Haskell data or newtype like in OOP languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-extra" = callPackage ({ mkDerivation }: mkDerivation { @@ -55855,6 +56049,7 @@ self: { gitrev Glob graph-wrapper hspec interpolate mockery silently string-conversions uniplate ]; + jailbreak = true; homepage = "https://github.com/soenkehahn/dead-code-detection#readme"; description = "detect dead code in haskell projects"; license = stdenv.lib.licenses.bsd3; @@ -56760,6 +56955,7 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/derive/"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; @@ -56781,6 +56977,7 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/derive/"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; @@ -56802,6 +56999,7 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/derive/"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; @@ -56823,13 +57021,14 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; + jailbreak = true; homepage = "https://github.com/ndmitchell/derive#readme"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "derive" = callPackage + "derive_2_5_22" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src-exts, pretty, process, syb, template-haskell , transformers, uniplate @@ -56844,12 +57043,14 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; + jailbreak = true; homepage = "https://github.com/ndmitchell/derive#readme"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "derive_2_5_23" = callPackage + "derive" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src-exts, pretty, process, syb, template-haskell , transformers, uniplate @@ -56864,11 +57065,9 @@ self: { base bytestring containers directory filepath haskell-src-exts pretty process syb template-haskell transformers uniplate ]; - jailbreak = true; homepage = "https://github.com/ndmitchell/derive#readme"; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-IG" = callPackage @@ -57392,6 +57591,7 @@ self: { diagrams-postscript diagrams-rasterific diagrams-svg directory filepath JuicyPixels lens lucid-svg ]; + jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; @@ -58159,6 +58359,7 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; + jailbreak = true; doCheck = false; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; @@ -58977,8 +59178,8 @@ self: { ({ mkDerivation, base, binary, bytestring, pretty, safe, time }: mkDerivation { pname = "dicom"; - version = "0.2.0.0"; - sha256 = "3772604143c86a3827e73924f5cbc404ab5506aabfa75f51396d3d54651e09fc"; + version = "0.3.0.0"; + sha256 = "d616ae5db9863803c7502986925598be9774842e714ed9c4dfecdc5dce9f3d20"; libraryHaskellDepends = [ base binary bytestring pretty safe time ]; @@ -60094,6 +60295,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "distributed-closure" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "distributed-closure"; + version = "0.1.0.0"; + sha256 = "7c49a85015f428e55af318214de93ce8ab9257e627ad6ef8592b781324aac52e"; + libraryHaskellDepends = [ + base binary bytestring constraints template-haskell + ]; + testHaskellDepends = [ base binary hspec QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/tweag/distributed-closure"; + description = "Serializable closures for distributed programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-process_0_5_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, deepseq, distributed-static, ghc-prim, hashable @@ -62110,8 +62329,8 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2"; - sha256 = "5a9aa7272b4d40f832d7501b8b1d6155004a21d8aea4bea283e8a067bcbf646f"; + version = "0.2.1"; + sha256 = "0e7019f08595769149e58e86ce503e636afa52028a68211dd4df1882c03626bd"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text @@ -66522,6 +66741,29 @@ self: { platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "eventstore_0_9_1_2" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal + , containers, network, protobuf, random, stm, tasty, tasty-hunit + , text, time, unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "0.9.1.2"; + sha256 = "0104a347dde1620795c82e60b16d38bd2c1b00f7ff1fbf0c8dccf8e877d0d497"; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring cereal containers network + protobuf random stm text time unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base stm tasty tasty-hunit text time + ]; + homepage = "http://github.com/YoEight/eventstore"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "every-bit-counts" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -67528,8 +67770,8 @@ self: { }: mkDerivation { pname = "extract-dependencies"; - version = "0.1.0.0"; - sha256 = "e13363fb87dd5d893d421619d2feab7a84167e1c3fa66aa105f320fd3e95d9e3"; + version = "0.2.0.0"; + sha256 = "30224debda1f730a50bd1f92a7906c9addef641475f60dd7feb3c14011da8b35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68196,7 +68438,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fay" = callPackage + "fay_0_23_1_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , data-lens-light, directory, filepath, ghc-paths, haskell-src-exts , language-ecmascript, mtl, mtl-compat, optparse-applicative @@ -68220,12 +68462,14 @@ self: { uniplate unordered-containers utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; + jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fay_0_23_1_10" = callPackage + "fay" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -68249,11 +68493,9 @@ self: { utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; - jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base_0_19_4_1" = callPackage @@ -69084,18 +69326,17 @@ self: { }) {}; "feed-collect" = callPackage - ({ mkDerivation, base, feed, http-client, http-client-tls, time - , time-units, timerep, transformers, utf8-string + ({ mkDerivation, base, data-default-class, feed, http-client + , http-client-tls, time, time-interval, time-units, timerep + , transformers, utf8-string }: mkDerivation { pname = "feed-collect"; - version = "0.1.0.1"; - sha256 = "e442e5999c34c998a7b15189af564730360effb3e5dbaa4d99f65076de445204"; - revision = "1"; - editedCabalFile = "0383f41e89586ae747cdb892d9404ae0c9a1fed72bb06dbc0fa9bd585885084d"; + version = "0.2.0.0"; + sha256 = "107701b470b86ef66be17fc76393995ad59e2912aa399bb4212bf63023152559"; libraryHaskellDepends = [ - base feed http-client http-client-tls time time-units timerep - transformers utf8-string + base data-default-class feed http-client http-client-tls time + time-interval time-units timerep transformers utf8-string ]; homepage = "http://rel4tion.org/projects/feed-collect/"; description = "Watch RSS/Atom feeds (and do with them whatever you like)"; @@ -69867,7 +70108,6 @@ self: { executableHaskellDepends = [ async base directory filepath haskell-src-exts MissingH ]; - jailbreak = true; homepage = "https://github.com/yamadapc/stack-run-auto"; description = "Takes a Haskell source-code file and outputs its modules"; license = stdenv.lib.licenses.mit; @@ -70386,6 +70626,7 @@ self: { base containers cpphs directory filepath haskell-src-exts process split text uniplate ]; + jailbreak = true; description = "Program to manage the imports of a haskell module"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70445,10 +70686,10 @@ self: { ({ mkDerivation, base, non-empty, utility-ht }: mkDerivation { pname = "fixed-length"; - version = "0.1"; - sha256 = "72be787d9f0e13ae09115ffd0c3decec100163e0c457050fb2b8106dd83ab284"; + version = "0.1.1"; + sha256 = "64630e4f00c9403e270cad744c862104a1248f8c18f565cd485a8725d45357d5"; libraryHaskellDepends = [ base non-empty utility-ht ]; - homepage = "http://code.haskell.org/~thielema/fixed-length/"; + homepage = "http://hub.darcs.net/thielema/fixed-length/"; description = "Lists with statically known length based on non-empty package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71585,21 +71826,23 @@ self: { "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , doctest, foldl, free, monoid-subclasses, profunctors - , semigroupoids, tasty, tasty-hunit, tasty-quickcheck, text - , transformers, void + , semigroupoids, semigroups, split, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, void }: mkDerivation { pname = "foldl-transduce"; - version = "0.4.5.0"; - sha256 = "a18a354ec6d8e7be3563ac400af331ff8d928a038b8ea7b3dc8c8e0bf5417564"; + version = "0.4.6.0"; + sha256 = "91a3114417eccc322d7b151029c88582a8875151a452df487c9fb857d724b2b5"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl free - monoid-subclasses profunctors semigroupoids text transformers void + monoid-subclasses profunctors semigroupoids semigroups split text + transformers void ]; testHaskellDepends = [ - base doctest foldl free monoid-subclasses tasty tasty-hunit + base doctest foldl free monoid-subclasses split tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73056,8 +73299,8 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.0.2"; - sha256 = "4928f55a3944a15a89023434aa3b1409eefd3a741e623eb5873d55ec7880d954"; + version = "0.1.1"; + sha256 = "f3a96bab73ddb6a26fd3ac705b7dc21e41b55a3027f4727f1e7307262a89207e"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels @@ -74127,8 +74370,8 @@ self: { ({ mkDerivation, base, GConf, glib, gtk2hs-buildtools, text }: mkDerivation { pname = "gconf"; - version = "0.13.0.2"; - sha256 = "930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77"; + version = "0.13.0.3"; + sha256 = "e8efb705c725ae56486585d0972f9dcec96db89c4d636f1805f7dd3e175d69d2"; libraryHaskellDepends = [ base glib text ]; libraryPkgconfigDepends = [ GConf ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -75288,8 +75531,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.12"; - sha256 = "f13fef8a35dbd5d2da9b5a8eb7361c848f973a70edb3ef243f0b4bfc409e5c19"; + version = "0.13"; + sha256 = "d193384dca0c9fdd8492ee888b1b8954b247f83ead6e4f3f81ded94377aaa34a"; libraryHaskellDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -75303,27 +75546,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "getopt-generics_0_13" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, filepath - , generics-sop, hspec, QuickCheck, safe, silently, tagged - }: - mkDerivation { - pname = "getopt-generics"; - version = "0.13"; - sha256 = "d193384dca0c9fdd8492ee888b1b8954b247f83ead6e4f3f81ded94377aaa34a"; - libraryHaskellDepends = [ - base base-compat base-orphans generics-sop tagged - ]; - testHaskellDepends = [ - base base-compat base-orphans filepath generics-sop hspec - QuickCheck safe silently tagged - ]; - homepage = "https://github.com/soenkehahn/getopt-generics#readme"; - description = "Create command line interfaces with ease"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -75521,8 +75743,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.0.0"; - sha256 = "11d840d8ad311cd474063c4531ae0bfbffde05eaf7b1a1de6d1b416b89fe2921"; + version = "0.5.0.1"; + sha256 = "ecdae12d521d0997a48a91507f241f80532df468f09095a50cc6f1629cd43ce8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75784,6 +76006,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-options" = callPackage + ({ mkDerivation, base, bin-package-db, Cabal, directory, filepath + , ghc, ghc-paths, process, transformers, unix + }: + mkDerivation { + pname = "ghc-options"; + version = "0.2.0.0"; + sha256 = "75443492d1e6eb65b536087aafc84655bbad6026d28ecda950b3cd67d5d44369"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bin-package-db Cabal directory filepath ghc ghc-paths process + transformers unix + ]; + executableHaskellDepends = [ + base bin-package-db Cabal directory filepath ghc ghc-paths process + transformers unix + ]; + homepage = "https://github.com/ranjitjhala/ghc-options.git"; + description = "Utilities for extracting GHC options needed to compile a given Haskell target"; + license = stdenv.lib.licenses.mit; + }) {}; + "ghc-parmake" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , HUnit, process, QuickCheck, temporary, test-framework @@ -75940,6 +76185,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghc-session_0_1_2_0" = callPackage + ({ mkDerivation, base, exceptions, ghc, ghc-mtl, ghc-paths + , transformers, transformers-compat + }: + mkDerivation { + pname = "ghc-session"; + version = "0.1.2.0"; + sha256 = "791a40e9130a3ad09f3226a5cb71ab6ca0492b35345a68078c4e67e7ccd93c94"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base exceptions ghc ghc-mtl ghc-paths transformers + transformers-compat + ]; + executableHaskellDepends = [ base transformers ]; + homepage = "http://github.com/pmlodawski/ghc-session"; + description = "Simplified GHC API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-simple" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath, ghc , ghc-paths @@ -76087,13 +76353,12 @@ self: { }: mkDerivation { pname = "ghc-vis"; - version = "0.7.2.7"; - sha256 = "9bebc52ea34a59f378fdb8f66670c001602f346ad2b3fba7aea5fb70eeaab34f"; + version = "0.7.2.8"; + sha256 = "0aea23534eb95bc39ad2f2e017aa978df0a6aea105c314bca2030ac5daf9187d"; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl svgcairo text transformers xdot ]; - jailbreak = true; homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; license = stdenv.lib.licenses.bsd3; @@ -76786,7 +77051,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gio" = callPackage + "gio_0_13_1_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib , gtk2hs-buildtools, mtl }: @@ -76801,6 +77066,24 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GIO"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gio" = callPackage + ({ mkDerivation, array, base, bytestring, containers, glib + , gtk2hs-buildtools, mtl + }: + mkDerivation { + pname = "gio"; + version = "0.13.1.1"; + sha256 = "d04d9b87b43bf12c5917ea561da403f80fe955adf735785ea8afa0915478113b"; + libraryHaskellDepends = [ + array base bytestring containers glib mtl + ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to GIO"; + license = stdenv.lib.licenses.lgpl21; }) {}; "gipeda_0_1_0_2" = callPackage @@ -77001,71 +77284,6 @@ self: { inherit (pkgs) which;}; "git-annex" = callPackage - ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, dlist, dns, edit-distance, esqueleto, exceptions - , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify - , hslogger, http-client, http-conduit, http-types, IfElse, json - , lsof, MissingH, monad-control, monad-logger, mtl, network - , network-info, network-multicast, network-protocol-xmpp - , network-uri, old-locale, openssh, optparse-applicative - , path-pieces, perl, persistent, persistent-sqlite - , persistent-template, process, QuickCheck, random, regex-tdfa - , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare - , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls - , wget, which, xml-types, yesod, yesod-core, yesod-default - , yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "5.20151116"; - sha256 = "1735577964a1a83a3959e25b6268512e9cd5dbec84b142f2de7b2cd025b97f73"; - configureFlags = [ - "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" - "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" - "-fwebapp-secure" "-fwebdav" "-fxmpp" - ]; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory dlist dns edit-distance esqueleto exceptions - fdo-notify feed filepath gnutls hinotify hslogger http-client - http-conduit http-types IfElse json MissingH monad-control - monad-logger mtl network network-info network-multicast - network-protocol-xmpp network-uri old-locale optparse-applicative - path-pieces persistent persistent-sqlite persistent-template - process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare stm tasty tasty-hunit tasty-quickcheck - tasty-rerun template-haskell text time torrent transformers unix - unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types - yesod yesod-core yesod-default yesod-form yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup install"; - checkPhase = "./git-annex test"; - enableSharedExecutables = false; - homepage = "http://git-annex.branchable.com/"; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ simons ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - - "git-annex_5_20151208" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra @@ -77124,7 +77342,6 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -77187,51 +77404,24 @@ self: { }) {}; "git-fmt" = callPackage - ({ mkDerivation, aeson, base, exceptions, extra, fast-logger - , filepath, monad-logger, monad-parallel, mtl, optparse-applicative - , pipes, pipes-concurrency, temporary, text, time - , unordered-containers, yaml - }: - mkDerivation { - pname = "git-fmt"; - version = "0.3.1.1"; - sha256 = "aebf8a47e92e0a3a9210d45f9abcdf4e9c54eadb1e1422586df6f226dd1b55e2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base extra filepath monad-logger mtl pipes text - unordered-containers yaml - ]; - executableHaskellDepends = [ - base exceptions extra fast-logger filepath monad-logger - monad-parallel mtl optparse-applicative pipes pipes-concurrency - temporary text time - ]; - homepage = "https://github.com/hjwylde/git-fmt"; - description = "Custom git command for formatting code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "git-fmt_0_4_0_0" = callPackage ({ mkDerivation, base, exceptions, extra, fast-logger, filepath , monad-logger, monad-parallel, mtl, omnifmt, optparse-applicative - , pipes, pipes-concurrency, temporary, text, time + , pipes, pipes-concurrency, process, temporary, text, time }: mkDerivation { pname = "git-fmt"; - version = "0.4.0.0"; - sha256 = "13f5792fd2006f56a916f4767acef37816b513ec88d4f0aa61b62f35ae725952"; + version = "0.4.1.0"; + sha256 = "a9c10f79f92b6a1650f4eac002542a35dda0048ed68d670602e97615b879e97d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base exceptions extra fast-logger filepath monad-logger monad-parallel mtl omnifmt optparse-applicative pipes - pipes-concurrency temporary text time + pipes-concurrency process temporary text time ]; homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-freq" = callPackage @@ -77340,8 +77530,8 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20150106"; - sha256 = "b791e353be5f6cb9aaada20a87e569e6bb2f55f4ea269747e10c6239c5cd0fa6"; + version = "1.20151215"; + sha256 = "e1e5756f7ffba86a36abcdc296e0730b2a74e0f5e7711b0b6b89a09eb6f10463"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78322,7 +78512,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; - "glib" = callPackage + "glib_0_13_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, glib , gtk2hs-buildtools, text, utf8-string }: @@ -78338,6 +78528,25 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + + "glib" = callPackage + ({ mkDerivation, base, bytestring, containers, glib + , gtk2hs-buildtools, text, utf8-string + }: + mkDerivation { + pname = "glib"; + version = "0.13.2.2"; + sha256 = "16bc6710ac195778e514c6ba1da3b22a057854d4db0929b4835172ec42e0497f"; + libraryHaskellDepends = [ + base bytestring containers text utf8-string + ]; + libraryPkgconfigDepends = [ glib ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the GLIB library for Gtk2Hs"; + license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -78930,6 +79139,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; + "gnss-converters" = callPackage + ({ mkDerivation, base, basic-prelude, binary-conduit, conduit + , conduit-extra, lens, resourcet, rtcm, sbp, tasty, tasty-hunit + }: + mkDerivation { + pname = "gnss-converters"; + version = "0.1.1"; + sha256 = "b225a109b0d264196abdf899c824c4d1e38c24c662bf888a9af9d968029117de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude conduit-extra lens rtcm sbp + ]; + executableHaskellDepends = [ + base basic-prelude binary-conduit conduit conduit-extra resourcet + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "http://github.com/swift-nav/gnss-converters"; + description = "GNSS Converters"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gnuidn_0_2_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, libidn, text }: mkDerivation { @@ -81361,6 +81592,7 @@ self: { version = "0.1.2"; sha256 = "0e820122cad388f31c3ef0815d7ff93b9e95a8fdec0d6c560c379fe0ecfdb010"; libraryHaskellDepends = [ base haskell-src-exts ]; + doHaddock = false; description = "Pretty printing for well-behaved Show instances"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -82029,6 +82261,25 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk_0_14_2" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, containers, gio + , glib, gtk2, gtk2hs-buildtools, mtl, pango, text + }: + mkDerivation { + pname = "gtk"; + version = "0.14.2"; + sha256 = "58f780c51fe2f3e25939a048bbe7d0b880e6aeb412df2648438f926a2b7b7eb5"; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk2 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Gtk+ graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk2 = pkgs.gnome2.gtk;}; + "gtk-helpers" = callPackage ({ mkDerivation, array, base, gio, glib, gtk, mtl, process , template-haskell @@ -82079,8 +82330,8 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.1.1"; - sha256 = "5d8d8b2d0f05c2ed3d54fd71cdc7513de808f8481b1982295f144f87b29e450b"; + version = "0.3.2.1"; + sha256 = "33ae28811e7fbcfe00b1379489c3c73d5023e6b63ebfb19cdea9ddf40c312f06"; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -82508,7 +82759,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; - "gtk3" = callPackage + "gtk3_0_14_1" = callPackage ({ mkDerivation, array, base, bytestring, cairo, containers, gio , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time , transformers @@ -82528,6 +82779,33 @@ self: { array base cairo text time transformers ]; doHaddock = false; + jailbreak = true; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Gtk+ 3 graphical user interface library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + + "gtk3" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, containers, gio + , glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time + , transformers + }: + mkDerivation { + pname = "gtk3"; + version = "0.14.2"; + sha256 = "da198906bf3807e61c6d3c85c8537f424d9073d517d511d38197c569a1cb3d1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring cairo containers gio glib mtl pango text + ]; + libraryPkgconfigDepends = [ gtk3 ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + executableHaskellDepends = [ + array base cairo text time transformers + ]; + doHaddock = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -82539,8 +82817,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.2.0"; - sha256 = "12ff75908181d0adec685b69fe94c4e4745d8a502a5b171af4898ba4582ae654"; + version = "0.3.2.1"; + sha256 = "c457a75dff24baf47a17f8763b4549be69305dcbc1cf8da7afa01ca62dd466f5"; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -82613,8 +82891,8 @@ self: { }: mkDerivation { pname = "gtksourceview2"; - version = "0.13.1.3"; - sha256 = "0eba5ee51206a8d99d4d4c4e24e0801492731fb2a67e953da15dbe27a7d328ca"; + version = "0.13.2.1"; + sha256 = "8a98b0dd60625db232152586f1f73c1e4cfdca30b8af6c155029b532aa75e206"; libraryHaskellDepends = [ array base containers glib gtk mtl text ]; @@ -82631,8 +82909,8 @@ self: { }: mkDerivation { pname = "gtksourceview3"; - version = "0.13.2.0"; - sha256 = "12038550255302b1dd6d2bf76b287390d475a77ba00728803fd1cd5968061632"; + version = "0.13.2.1"; + sha256 = "61542fc063d948a0487c0fe784f8154d4a9ca66df3e29bbff0047843bb006ceb"; libraryHaskellDepends = [ array base containers glib gtk3 mtl text ]; @@ -85301,7 +85579,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "half" = callPackage + "half_0_2_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "half"; @@ -85311,6 +85589,19 @@ self: { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "half" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "half"; + version = "0.2.2.2"; + sha256 = "5be5dbd5279bc921407dd9286a0f82bf77a895ca2e9f7d5169fddca99b58a99f"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/half"; + description = "Half-precision floating-point"; + license = stdenv.lib.licenses.bsd3; }) {}; "halfs" = callPackage @@ -85544,16 +85835,18 @@ self: { }) {}; "handa-opengl" = callPackage - ({ mkDerivation, array, base, data-default, GLUT, OpenGL - , opengl-dlp-stereo + ({ mkDerivation, aeson, array, base, binary, data-default, GLUT + , OpenGL, opengl-dlp-stereo, vector-space }: mkDerivation { pname = "handa-opengl"; - version = "0.1.6.1"; - sha256 = "7af827245496a5a08e6e2491f66f06de3ab961a9d835684d2f5ae8a026886221"; + version = "0.1.11.2"; + sha256 = "ccf110aae686a4a0aef749c0b05c05b8edd372f84f4cafa86f4ff6dc7dd5084d"; libraryHaskellDepends = [ - array base data-default GLUT OpenGL opengl-dlp-stereo + aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo + vector-space ]; + jailbreak = true; homepage = "https://bitbucket.org/bwbush/handa-opengl"; description = "Utility functions for OpenGL and GLUT"; license = stdenv.lib.licenses.mit; @@ -85678,6 +85971,17 @@ self: { broken = true; }) {pfq = null;}; + "haphviz" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "haphviz"; + version = "0.1.0.2"; + sha256 = "84ff9cb5d293a237192b472f64c7bb78ef07fa48e3b2ec8a1763ee5d8c66a555"; + libraryHaskellDepends = [ base mtl text ]; + description = "Graphviz code generation with Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath , hspec, mtl, process, temporary, time, time-locale-compat @@ -88273,7 +88577,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-exts" = callPackage + "haskell-src-exts_1_16_0_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, smallcheck, syb, tasty , tasty-golden, tasty-smallcheck @@ -88291,9 +88595,10 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-exts_1_17_1" = callPackage + "haskell-src-exts" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , syb, tasty, tasty-golden, tasty-smallcheck @@ -88313,7 +88618,6 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-qq" = callPackage @@ -88402,7 +88706,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-meta" = callPackage + "haskell-src-meta_0_6_0_12" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans }: @@ -88413,11 +88717,13 @@ self: { libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; + jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-src-meta_0_6_0_13" = callPackage + "haskell-src-meta" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans }: @@ -88430,7 +88736,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -89032,8 +89337,8 @@ self: { }: mkDerivation { pname = "haskellscrabble"; - version = "1.2"; - sha256 = "2ac73cbcb6327fe989dbc1293e7d58184958d7f7455a9521a353d2d5742ea8cd"; + version = "1.2.1"; + sha256 = "d96c922eed1c4d008d02a4cf4ce6c4d9402dbea1e4c776f6f6e6833bb3189a92"; libraryHaskellDepends = [ array arrows base containers errors listsafe mtl parsec QuickCheck random safe semigroups split transformers unordered-containers @@ -94028,7 +94333,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "highlighting-kate" = callPackage + "highlighting-kate_0_6" = callPackage ({ mkDerivation, base, blaze-html, containers, Diff, directory , filepath, mtl, parsec, pcre-light, process, utf8-string }: @@ -94051,6 +94356,32 @@ self: { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "highlighting-kate" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers, Diff + , directory, filepath, mtl, parsec, pcre-light, process + , utf8-string + }: + mkDerivation { + pname = "highlighting-kate"; + version = "0.6.1"; + sha256 = "cb57caf861bda046043575772ffc7fd4cd21dd63a0ecdf26b624c7e930e0f30e"; + configureFlags = [ "-fpcre-light" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers mtl parsec pcre-light + utf8-string + ]; + executableHaskellDepends = [ base blaze-html containers filepath ]; + testHaskellDepends = [ + base blaze-html containers Diff directory filepath process + ]; + homepage = "http://github.com/jgm/highlighting-kate"; + description = "Syntax highlighting"; + license = "GPL"; }) {}; "hills" = callPackage @@ -94163,6 +94494,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -94192,6 +94524,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -94221,6 +94554,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -94250,6 +94584,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -94257,14 +94592,14 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, applicative-quoters, base, data-default - , descriptive, directory, ghc-prim, haskell-src-exts, hspec - , monad-loops, mtl, text, transformers + ({ mkDerivation, base, data-default, descriptive, directory + , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, text + , transformers }: mkDerivation { pname = "hindent"; - version = "4.5.7"; - sha256 = "23cc3274b525011c1f6b865946ca247ebd986d960acee1454f897a78f1c862fe"; + version = "4.6.0"; + sha256 = "07039aa7729c3138e62c366efe11b148288ae6443539d0e7df61d157d2895d99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94272,8 +94607,7 @@ self: { transformers ]; executableHaskellDepends = [ - applicative-quoters base descriptive directory ghc-prim - haskell-src-exts text + base descriptive directory ghc-prim haskell-src-exts text ]; testHaskellDepends = [ base data-default directory haskell-src-exts hspec monad-loops mtl @@ -95110,8 +95444,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.8.0.0"; - sha256 = "36b1b6c83a1488d2674a13f0000cef8dee80d4f6835199b7b6453768f25e30cd"; + version = "0.8.0.1"; + sha256 = "aeada3426b294cfc43a7cfac053aae0ee1fd06a5c551ecd0d3a6d725e47c89dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95618,6 +95952,7 @@ self: { hledger hledger-lib HUnit lens pretty-show safe split time transformers vector vty ]; + jailbreak = true; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; @@ -95836,6 +96171,21 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) openssl;}; + "hlibgit2_0_18_0_15" = callPackage + ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: + mkDerivation { + pname = "hlibgit2"; + version = "0.18.0.15"; + sha256 = "1170c1f71b39d13699018c29688c005c7aa2d07d8bbbb9d383a9a85e5d4c5601"; + libraryHaskellDepends = [ base bindings-DSL zlib ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ git ]; + description = "Low-level bindings to libgit2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) git; inherit (pkgs) openssl;}; + "hlibsass" = callPackage ({ mkDerivation, base, hspec, libsass }: mkDerivation { @@ -95867,6 +96217,7 @@ self: { filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -95889,6 +96240,7 @@ self: { filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -95897,7 +96249,7 @@ self: { "hlint_1_9_16" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, process + , directory, extra, filepath, haskell-src-exts, hscolour, process , transformers, uniplate }: mkDerivation { @@ -95910,9 +96262,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts process transformers uniplate + filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -95935,6 +96288,7 @@ self: { filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -95957,6 +96311,7 @@ self: { filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -95979,13 +96334,14 @@ self: { filepath haskell-src-exts hscolour process transformers uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hlint" = callPackage + "hlint_1_9_22" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate @@ -96002,12 +96358,14 @@ self: { uniplate ]; executableHaskellDepends = [ base ]; + jailbreak = true; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hlint_1_9_25" = callPackage + "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate @@ -96024,11 +96382,9 @@ self: { uniplate ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/ndmitchell/hlint#readme"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlogger" = callPackage @@ -97422,6 +97778,7 @@ self: { ]; executableToolDepends = [ happy ]; testHaskellDepends = [ base haskell-src-exts uniplate ]; + jailbreak = true; homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; @@ -97478,12 +97835,12 @@ self: { }) {}; "hood" = callPackage - ({ mkDerivation, array, base }: + ({ mkDerivation, array, base, FPretty, ghc-prim }: mkDerivation { pname = "hood"; - version = "0.2.1"; - sha256 = "d00bc71cf6f43b141b19f18399c9ad1114e1466d9a55bd6a6506d68c57d828b9"; - libraryHaskellDepends = [ array base ]; + version = "0.3"; + sha256 = "f1962dfb05d01a345335872fa36509999755c71a9381b4941bd04a9cb72b6122"; + libraryHaskellDepends = [ array base FPretty ghc-prim ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood"; description = "Debugging by observing in place"; license = stdenv.lib.licenses.bsd3; @@ -97743,6 +98100,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -97777,6 +98135,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -97811,6 +98170,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -97845,6 +98205,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; @@ -97880,6 +98241,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; @@ -97915,6 +98277,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; @@ -97950,6 +98313,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; + jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; @@ -98289,8 +98653,8 @@ self: { }: mkDerivation { pname = "hops"; - version = "0.1.3"; - sha256 = "3a87efb934782a3769e7daf79ff5252bae58359701a8d1f829ce83a7436bcb13"; + version = "0.2.1"; + sha256 = "00d23e9c1c536575cc3dff5eb9c0606e914f8914fec101f5b0bd6303a301fe9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99114,7 +99478,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hprotoc" = callPackage + "hprotoc_2_1_9" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec , protocol-buffers, protocol-buffers-descriptor, utf8-string @@ -99137,6 +99501,36 @@ self: { protocol-buffers-descriptor utf8-string ]; executableToolDepends = [ alex ]; + jailbreak = true; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hprotoc" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, filepath, haskell-src-exts, mtl, parsec + , protocol-buffers, protocol-buffers-descriptor, utf8-string + }: + mkDerivation { + pname = "hprotoc"; + version = "2.1.12"; + sha256 = "c99c4ceb0a8dad2186c5e2af16898eed5a16d8646052d2fa8c4f29ee39ee1add"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + executableToolDepends = [ alex ]; homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; @@ -100633,6 +101027,7 @@ self: { testHaskellDepends = [ base directory mtl process test-simple Unixutils ]; + jailbreak = true; homepage = "https://github.com/bosu/hscope"; description = "cscope like browser for Haskell code"; license = stdenv.lib.licenses.bsd3; @@ -101174,7 +101569,6 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; - jailbreak = true; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102753,7 +103147,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-wai" = callPackage + "hspec-wai_0_6_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, hspec , hspec-core, hspec-expectations, http-types, QuickCheck, text , transformers, wai, wai-extra @@ -102773,6 +103167,31 @@ self: { ]; description = "Experimental Hspec support for testing WAI applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hspec-wai" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , hspec, hspec-core, hspec-expectations, http-types, QuickCheck + , text, transformers, wai, wai-extra + }: + mkDerivation { + pname = "hspec-wai"; + version = "0.6.4"; + sha256 = "245ad277767a127ce8755c34fbc0374015250afef6f3c9af6c3aadee9f874860"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + testHaskellDepends = [ + base base-compat bytestring case-insensitive hspec hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + homepage = "https://github.com/hspec/hspec-wai#readme"; + description = "Experimental Hspec support for testing WAI applications"; + license = stdenv.lib.licenses.mit; }) {}; "hspec-wai-json_0_6_0" = callPackage @@ -103173,6 +103592,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hsseccomp" = callPackage + ({ mkDerivation, base, seccomp, tasty, tasty-hunit, unix }: + mkDerivation { + pname = "hsseccomp"; + version = "0.1.0.2"; + sha256 = "fce6e18b1a87e1f62f3aad709d8a41fa4b34646cc32ec973ed279914c794dc0b"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ seccomp ]; + testHaskellDepends = [ base tasty tasty-hunit unix ]; + description = "Haskell bindings to libseccomp"; + license = "LGPL"; + }) {seccomp = null;}; + "hsshellscript" = callPackage ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { @@ -103525,6 +103957,7 @@ self: { base bytestring haskell-src-exts haskell-src-meta mtl template-haskell utf8-string ]; + jailbreak = true; homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; @@ -103915,8 +104348,8 @@ self: { }: mkDerivation { pname = "htoml"; - version = "0.1.0.2"; - sha256 = "55ab80da813d6073e9da62ce3b4a706232b2b9889e755f40e3c5bc1d753c653f"; + version = "0.1.0.3"; + sha256 = "84890e99f5f01d38c2177f9d4f1ff1ce4e50e832a663d1c3ebe7d9750156ab16"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103928,7 +104361,7 @@ self: { tasty-hspec tasty-hunit text time unordered-containers vector ]; testHaskellDepends = [ - base bytestring Cabal containers file-embed parsec tasty + aeson base bytestring Cabal containers file-embed parsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; homepage = "https://github.com/cies/htoml"; @@ -104038,7 +104471,7 @@ self: { license = "unknown"; }) {}; - "http-api-data" = callPackage + "http-api-data_0_2_1" = callPackage ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit , QuickCheck, text, time }: @@ -104053,6 +104486,26 @@ self: { homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-api-data" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit + , QuickCheck, text, time, time-locale-compat + }: + mkDerivation { + pname = "http-api-data"; + version = "0.2.2"; + sha256 = "fba6a38c0f3a39e2ce02b42351953d9aa82f48ef83e5c921a9a1e719b8bc45dc"; + libraryHaskellDepends = [ + base bytestring text time time-locale-compat + ]; + testHaskellDepends = [ + base doctest Glob hspec HUnit QuickCheck text time + ]; + homepage = "http://github.com/fizruk/http-api-data"; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; }) {}; "http-attoparsec" = callPackage @@ -104750,7 +105203,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_24" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -104778,6 +105231,68 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.25"; + sha256 = "2aaefe7d75a0052b32a14cd3749c2a94602a64d87195722cebe75ebde014ec6d"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; + }) {}; + + "http-client_0_4_26_1" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.26.1"; + sha256 = "38c264cdc0ad0dcc1f0fbd11a2fa638b55f65476ebcee0bdd9309c38fb5f1047"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -108803,6 +109318,7 @@ self: { setenv shelly split stm strict system-argv0 text transformers unix unordered-containers utf8-string uuid vector ]; + jailbreak = true; doCheck = false; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; @@ -108811,47 +109327,6 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db - , bytestring, cereal, cmdargs, containers, directory, filepath, ghc - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, http-client, http-client-tls, HUnit, ipython-kernel, mtl - , parsec, process, random, setenv, shelly, split, stm, strict - , system-argv0, text, transformers, unix, unordered-containers - , utf8-string, uuid, vector - }: - mkDerivation { - pname = "ihaskell"; - version = "0.8.2.0"; - sha256 = "46ded8d9b827c7e3e0eb40379fbf8bc8bbfa85a1c0feacf463c4673c342d9ba4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring bin-package-db bytestring cereal - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint http-client http-client-tls - ipython-kernel mtl parsec process random shelly split stm strict - system-argv0 text transformers unix unordered-containers - utf8-string uuid vector - ]; - executableHaskellDepends = [ - aeson base bin-package-db bytestring containers directory ghc here - ipython-kernel process strict text transformers unix - ]; - testHaskellDepends = [ - aeson base base64-bytestring bin-package-db bytestring cereal - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client - http-client-tls HUnit ipython-kernel mtl parsec process random - setenv shelly split stm strict system-argv0 text transformers unix - unordered-containers utf8-string uuid vector - ]; - doCheck = false; - homepage = "http://github.com/gibiansky/IHaskell"; - description = "A Haskell backend kernel for the IPython project"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ihaskell_0_8_3_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db , bytestring, cereal, cmdargs, containers, directory, filepath, ghc , ghc-parser, ghc-paths, haskeline, haskell-src-exts, hlint, hspec @@ -108888,11 +109363,10 @@ self: { stm strict system-argv0 text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; + doCheck = false; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -109425,15 +109899,15 @@ self: { "imperative-edsl-vhdl" = callPackage ({ mkDerivation, base, bytestring, constraints, containers - , language-vhdl, mtl, operational-alacarte, pretty + , language-vhdl, mtl, operational-alacarte, pretty, syntactic }: mkDerivation { pname = "imperative-edsl-vhdl"; - version = "0.2.0.1"; - sha256 = "cafdc2e541b1b9937c40a985e6047999aa254e27208d04b42583b3bdfbc69808"; + version = "0.3.2"; + sha256 = "2bc6771e4dad56aba06441139c4649232cd876ec56d87bc96e57430096843098"; libraryHaskellDepends = [ base bytestring constraints containers language-vhdl mtl - operational-alacarte pretty + operational-alacarte pretty syntactic ]; description = "Deep embedding of VHDL programs with code generation"; license = stdenv.lib.licenses.bsd3; @@ -111341,29 +111815,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, process, SHA, temporary, text - , transformers, uuid, zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.8.2.0"; - sha256 = "0b028b9910f90aee9c3b4adb8e59b79aed37ab307501c92158594d28c29ca122"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cereal containers directory filepath mtl - process SHA temporary text transformers uuid zeromq4-haskell - ]; - executableHaskellDepends = [ - base filepath mtl parsec text transformers - ]; - homepage = "http://github.com/gibiansky/IHaskell"; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_8_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , directory, filepath, mtl, parsec, process, SHA, temporary, text , transformers, unordered-containers, uuid, zeromq4-haskell @@ -111385,7 +111836,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -114042,23 +114492,20 @@ self: { "jsonrpc-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, mtl, text, transformers, unordered-containers + , conduit-extra, hspec, mtl, text, transformers + , unordered-containers }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.2.6"; - sha256 = "7e8ff67a7b8d93add988511fa11669fc45814ea5c5c7de7c20e22e7c58e4b222"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "9e2407e7a2f086d2d4c3ec7e8952a663bca6e487936d147cfb643dfcd1d1014e"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra mtl text - transformers unordered-containers + testHaskellDepends = [ + aeson base bytestring conduit conduit-extra hspec text ]; - jailbreak = true; description = "JSON-RPC 2.0 server over a Conduit."; license = stdenv.lib.licenses.gpl3; }) {}; @@ -117955,8 +118402,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-vhdl"; - version = "0.1.1.0"; - sha256 = "132ae3cc1b71d535db66fd794f1c26434f8f72f330989def825a2b05e269608a"; + version = "0.1.2.4"; + sha256 = "f3a19de12610c6273138467bfc89795e98d7dddc1064f8e1a947b0d8c16fe93b"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/markus-git/language-vhdl"; description = "VHDL AST and pretty printer in Haskell"; @@ -117981,19 +118428,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "largeword_1_2_4" = callPackage + "largeword_1_2_5" = callPackage ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "largeword"; - version = "1.2.4"; - sha256 = "0132ffdc0a7429339160ce0651c65ac504cff46c5f1744bd7dd6fb1c9a3351d5"; + version = "1.2.5"; + sha256 = "00b3b06d846649bf404f52a725c88349a38bc8c810e16c99f3100c4e1e9d7d46"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base binary bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/idontgetoutmuch/largeword"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; license = stdenv.lib.licenses.bsd3; @@ -118161,10 +118609,8 @@ self: { }: mkDerivation { pname = "lattices"; - version = "1.4.1"; - sha256 = "b1148cd7ed7fde0964fa53e5b1c304370291f08cfaa77dab3a6cfb01c8ae34ff"; - revision = "1"; - editedCabalFile = "ceeada8cfea894629b6232d6c3367bf182bcc76f9f6c77937d23d02ba8f4345f"; + version = "1.5.0"; + sha256 = "c6e3fb4334503b9087209195f40c96f56819497f999959358a2ff5d843a45d1f"; libraryHaskellDepends = [ base containers deepseq hashable semigroups tagged universe-base universe-reverse-instances unordered-containers void @@ -118655,6 +119101,7 @@ self: { leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; + jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -120981,6 +121428,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "link-relations" = callPackage + ({ mkDerivation, base, bytestring, hashable, unordered-containers + , uri-bytestring + }: + mkDerivation { + pname = "link-relations"; + version = "0.1.0.0"; + sha256 = "4944ffa47d4758135c40f776634e1f7b542c8886ef62b61f224a973c143173cb"; + libraryHaskellDepends = [ + base bytestring hashable unordered-containers uri-bytestring + ]; + homepage = "http://hub.darcs.net/fr33domlover/link-relations"; + description = "Use web link relation types (RFC 5988) in Haskell"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "linkchk" = callPackage ({ mkDerivation, base, gtk, haskell98, popenhs, regex-compat, unix }: @@ -122880,6 +123343,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logplex-parse" = callPackage + ({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }: + mkDerivation { + pname = "logplex-parse"; + version = "0.1.0.2"; + sha256 = "e802251aa40c73f9dea2ebe0b7bd92450b94a513343f165cccb2e86489403604"; + libraryHaskellDepends = [ base iso8601-time parsec text time ]; + testHaskellDepends = [ base hspec time ]; + homepage = "https://github.com/keithduncan/logplex-parse"; + description = "Parse Heroku application/logplex documents"; + license = stdenv.lib.licenses.mit; + }) {}; + "logsink" = callPackage ({ mkDerivation, base, hspec, hsyslog, logging-facade, time }: mkDerivation { @@ -123673,8 +124149,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.7.2"; - sha256 = "0ae406e8958c1e6f2520a01d74a55b70d158198ef0d08bbaf30452dc54e9deab"; + version = "0.8.2.1"; + sha256 = "c0952ec7314fd13faf10326648cf49561da4687d5e011d19694d84c2c26ddd51"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -123684,45 +124160,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "luminance_0_8_2" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.8.2"; - sha256 = "e7ec4cb6b688077c51de48ebe4ad552e8943ad0f4a7aabfda608652c0ccfdaba"; - libraryHaskellDepends = [ - base containers contravariant dlist gl linear mtl resourcet - semigroups transformers vector void - ]; - homepage = "https://github.com/phaazon/luminance"; - description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "luminance-samples" = callPackage - ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear - , luminance, mtl, resourcet, transformers - }: - mkDerivation { - pname = "luminance-samples"; - version = "0.7"; - sha256 = "443f255f4a036f4519f97676a5a5cfa6be02eeecefd1fdbc28f0161034774c36"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base contravariant GLFW-b JuicyPixels linear luminance mtl - resourcet transformers - ]; - homepage = "https://github.com/phaazon/luminance-samples"; - description = "Luminance samples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "luminance-samples_0_8" = callPackage ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear , luminance, mtl, resourcet, transformers }: @@ -123736,11 +124174,10 @@ self: { base contravariant GLFW-b JuicyPixels linear luminance mtl resourcet transformers ]; - jailbreak = true; homepage = "https://github.com/phaazon/luminance-samples"; description = "Luminance samples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lushtags" = callPackage @@ -124100,8 +124537,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "2.1.0"; - sha256 = "2fe8be49de7346a0df30feca7cd48864e4bac1ef356a1709414fc1a84762dc83"; + version = "3.0.0"; + sha256 = "5930f7c4d8e0c539f93595b661ecb700506d7e03043d85cfee8ce32768ff2fa0"; libraryHaskellDepends = [ arrows base free mtl profunctors semigroups ]; @@ -124159,6 +124596,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "machines-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, machines }: + mkDerivation { + pname = "machines-binary"; + version = "0.2.0.0"; + sha256 = "b8f7d857f4d79c853845e1ff2eb3f10968787da02e523279d69a86b089215519"; + libraryHaskellDepends = [ base binary bytestring machines ]; + homepage = "http://github.com/aloiscochard/machines-binary"; + description = "Binary utilities for the machines library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "machines-directory_0_2_0_0" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers @@ -128662,6 +129111,7 @@ self: { testHaskellDepends = [ base containers filepath haskell-src-exts HUnit process ]; + jailbreak = true; homepage = "https://github.com/seereason/module-management"; description = "Clean up module imports, split and merge modules"; license = stdenv.lib.licenses.bsd3; @@ -129297,7 +129747,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-logger" = callPackage + "monad-logger_0_3_15" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -129317,6 +129767,29 @@ self: { 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" = 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.16"; + sha256 = "1ee1b69e5732dab1cd833e8f0ea8092dc4c82b6548e7a46669192f0c0c641622"; + 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; }) {}; "monad-logger-json" = callPackage @@ -130499,8 +130972,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.10.0"; - sha256 = "5f71c909ed5b5b399fdceeb565b3eb3c19fbcdd771ca9a87595f863c35429fab"; + version = "0.10.0.1"; + sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d"; libraryHaskellDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups split text transformers @@ -131092,6 +131565,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mpris" = callPackage + ({ mkDerivation, base, containers, dbus, mtl }: + mkDerivation { + pname = "mpris"; + version = "0.1.0.0"; + sha256 = "3ee98b2f922e746982a46c8bd71058c1b9882c05db3eb21d21573d9b42158685"; + libraryHaskellDepends = [ base containers dbus mtl ]; + jailbreak = true; + homepage = "http://github.com/Fuco1/mpris"; + description = "Interface for MPRIS"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mprover" = callPackage ({ mkDerivation, base, containers, haskell98, mtl, parsec, pretty , transformers, unbound @@ -133605,7 +134091,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation" = callPackage + "neat-interpolation_0_2_3" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell }: mkDerivation { @@ -133620,6 +134106,24 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "neat-interpolation" = callPackage + ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell + , text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.3"; + sha256 = "fd8b935d2e674456a6db7af90974cb5d2381709bca20051c2da024888b80fd25"; + libraryHaskellDepends = [ + base base-prelude parsec template-haskell text + ]; + testHaskellDepends = [ base-prelude HTF ]; + homepage = "https://github.com/nikita-volkov/neat-interpolation"; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = stdenv.lib.licenses.mit; }) {}; "needle" = callPackage @@ -135721,6 +136225,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "niagra" = callPackage + ({ mkDerivation, base, criterion, mtl, text, transformers }: + mkDerivation { + pname = "niagra"; + version = "0.0.1"; + sha256 = "848bd318b105bd23de959d3a6e026de1577337fcae803bfa1dc70461491c9058"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl text transformers ]; + executableHaskellDepends = [ base criterion text transformers ]; + description = "CSS EDSL for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "nibblestring" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring , bytestring, containers, HUnit, test-framework @@ -137365,32 +137883,6 @@ self: { }) {}; "omnifmt" = callPackage - ({ mkDerivation, aeson, base, exceptions, extra, fast-logger - , filepath, monad-logger, monad-parallel, mtl, optparse-applicative - , pipes, pipes-concurrency, temporary, text, time - , unordered-containers, yaml - }: - mkDerivation { - pname = "omnifmt"; - version = "0.2.0.0"; - sha256 = "72c9e0d84550b3b7a406186f951e148cb9f4a954f5ac8f5ef1512f28335af7c9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base exceptions extra filepath monad-logger mtl pipes text - unordered-containers yaml - ]; - executableHaskellDepends = [ - base exceptions extra fast-logger filepath monad-logger - monad-parallel mtl optparse-applicative pipes pipes-concurrency - temporary text time - ]; - homepage = "https://github.com/hjwylde/omnifmt"; - description = "A pretty-printer wrapper to faciliate ease of formatting during development"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "omnifmt_0_2_1_1" = callPackage ({ mkDerivation, aeson, base, exceptions, extra, fast-logger , filepath, monad-logger, monad-parallel, mtl, optparse-applicative , pipes, pipes-concurrency, temporary, text, time @@ -137414,7 +137906,6 @@ self: { homepage = "https://github.com/hjwylde/omnifmt"; description = "A pretty-printer wrapper to faciliate ease of formatting during development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "on-a-horse" = callPackage @@ -137856,13 +138347,17 @@ self: { }) {}; "open-typerep" = callPackage - ({ mkDerivation, base, constraints, mtl, syntactic, tagged }: + ({ mkDerivation, base, base-orphans, constraints, mtl, syntactic + , tagged, template-haskell + }: mkDerivation { pname = "open-typerep"; - version = "0.3.3"; - sha256 = "bca107a946e61174bec6ab05e98bbd5757bcf20bf4621717d420c89de54f7897"; - libraryHaskellDepends = [ base constraints mtl syntactic tagged ]; - testHaskellDepends = [ base ]; + version = "0.4"; + sha256 = "d849bf8302ba7dab351a2e1a4df679fdf4938e17cc1f81c455eb163836839caa"; + libraryHaskellDepends = [ + base base-orphans constraints mtl syntactic tagged template-haskell + ]; + testHaskellDepends = [ base syntactic ]; homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; @@ -137985,8 +138480,8 @@ self: { ({ mkDerivation, base, data-default, GLUT, OpenGL, vector }: mkDerivation { pname = "opengl-dlp-stereo"; - version = "0.1.4.1"; - sha256 = "adaeeaa628dbd57c8b63ca4614464815f55e810c36c483cd0bd6f3be6880652b"; + version = "0.1.5.2"; + sha256 = "ae6c39a874af2fe12fd5af0dfc312ed9c2156a9240243c8ff81aa66970b0cad1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-default GLUT OpenGL vector ]; @@ -137999,15 +138494,17 @@ self: { }) {}; "opengl-spacenavigator" = callPackage - ({ mkDerivation, base, data-default, GLUT, OpenGL }: + ({ mkDerivation, base, binary, data-default, GLUT, OpenGL }: mkDerivation { pname = "opengl-spacenavigator"; - version = "0.1.4.2"; - sha256 = "2f6063bfc11c3cbfc3c6feedcb124debd40ae6e02d67dea8b8e9024e545da44e"; + version = "0.1.5.2"; + sha256 = "5a170fb876359fde525cb11b8dc2df4465275df3a091d75e663b4b45177df5e7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base data-default GLUT OpenGL ]; - executableHaskellDepends = [ base data-default GLUT OpenGL ]; + libraryHaskellDepends = [ base binary data-default GLUT OpenGL ]; + executableHaskellDepends = [ + base binary data-default GLUT OpenGL + ]; homepage = "https://bitbucket.org/bwbush/opengl-spacenavigator"; description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL"; license = stdenv.lib.licenses.mit; @@ -139361,6 +139858,7 @@ self: { base Cabal directory filepath haskell-src-exts optparse-applicative split ]; + jailbreak = true; homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; @@ -140530,7 +141028,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) pango;}; - "pango" = callPackage + "pango_0_13_1_0" = callPackage ({ mkDerivation, array, base, cairo, containers, directory, glib , gtk2hs-buildtools, mtl, pango, pretty, process, text }: @@ -140546,6 +141044,25 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome) pango;}; + + "pango" = callPackage + ({ mkDerivation, array, base, cairo, containers, directory, glib + , gtk2hs-buildtools, mtl, pango, pretty, process, text + }: + mkDerivation { + pname = "pango"; + version = "0.13.1.1"; + sha256 = "3c22f339fe2e30cb6d6cbc5906e1064c5fdabfbc56d2a2c015ac70b4aa5165ad"; + libraryHaskellDepends = [ + array base cairo containers directory glib mtl pretty process text + ]; + libraryPkgconfigDepends = [ pango ]; + libraryToolDepends = [ gtk2hs-buildtools ]; + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Pango text rendering engine"; + license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome) pango;}; "papillon" = callPackage @@ -141638,16 +142155,19 @@ self: { }) {}; "pathtype" = callPackage - ({ mkDerivation, base, deepseq, directory, QuickCheck, random, time + ({ mkDerivation, base, deepseq, directory, QuickCheck, random + , tagged, time, transformers, utility-ht }: mkDerivation { pname = "pathtype"; - version = "0.6"; - sha256 = "92bc70d7b9f2d495caf54f80d378622e347e57d9262bda6fc503fbe7d986be51"; + version = "0.7"; + sha256 = "fb6512d284c41feb1d31375cb47144ab13d4f4435d62dc977c511dacdb70e616"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq directory QuickCheck time ]; - executableHaskellDepends = [ base ]; + libraryHaskellDepends = [ + base deepseq directory QuickCheck tagged time transformers + utility-ht + ]; testHaskellDepends = [ base random ]; homepage = "http://hub.darcs.net/thielema/pathtype/"; description = "Type-safe replacement for System.FilePath etc"; @@ -141735,14 +142255,14 @@ self: { }) {}; "paypal-adaptive-hoops" = callPackage - ({ mkDerivation, aeson, base, bytestring, errors, http-client - , HUnit, lens, lens-aeson, test-framework, test-framework-hunit - , text, time, transformers, unordered-containers, vector, wreq + ({ mkDerivation, aeson, base, bytestring, directory, errors + , filepath, http-client, HUnit, lens, lens-aeson, test-framework + , test-framework-hunit, text, time, transformers, vector, wreq }: mkDerivation { pname = "paypal-adaptive-hoops"; - version = "0.11.0.2"; - sha256 = "3507d136ce1b189c66de9c36a5b0511e439e2d18f6107f9bead176ccd391e17c"; + version = "0.13.1.0"; + sha256 = "09997162d0533ec80a0cda3bcb84f48a59acdac367a61703fb32c98594d5965f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141751,8 +142271,8 @@ self: { ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - aeson base bytestring HUnit test-framework test-framework-hunit - text unordered-containers + aeson base bytestring directory filepath HUnit test-framework + test-framework-hunit text ]; jailbreak = true; homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; @@ -143124,6 +143644,41 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_2_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, hspec, http-api-data, lifted-base + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.2.4"; + sha256 = "ae56121abbef8ecca7aa7c62b2e77a47e583d4dded0f8e4bfe1cd6b1fea70bbe"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger http-api-data + lifted-base monad-control monad-logger mtl old-locale path-pieces + resource-pool resourcet scientific silently tagged template-haskell + text time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + 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-cereal" = callPackage ({ mkDerivation, base, cereal, persistent, text }: mkDerivation { @@ -145043,17 +145598,17 @@ self: { }) {}; "pinchot" = callPackage - ({ mkDerivation, base, containers, Earley, template-haskell + ({ mkDerivation, base, containers, Earley, lens, template-haskell , transformers }: mkDerivation { pname = "pinchot"; - version = "0.2.0.0"; - sha256 = "292bf5416f7fee0573aec8ca989704b422f50957afebd3098b1f2f953e4d3805"; + version = "0.4.0.0"; + sha256 = "362b2f8c0c1d4b4d768e8ae98a5c3d68db27d2b713055878079d2ff7ff905495"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers Earley template-haskell transformers + base containers Earley lens template-haskell transformers ]; homepage = "http://www.github.com/massysett/pinchot"; description = "Build parsers and ASTs for context-free grammars"; @@ -145984,6 +146539,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-transduce" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, conceit + , containers, doctest, foldl, free, lens-family-core + , monoid-subclasses, pipes, pipes-bytestring, pipes-concurrency + , pipes-group, pipes-parse, pipes-safe, pipes-text, semigroupoids + , semigroups, tasty, tasty-hunit, text, transformers, void + }: + mkDerivation { + pname = "pipes-transduce"; + version = "0.1.0.0"; + sha256 = "b6b2974613f9574a76eb54211fc6702df311fcb0e0737b03e35946df0be04182"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad conceit containers foldl free + lens-family-core monoid-subclasses pipes pipes-bytestring + pipes-concurrency pipes-group pipes-parse pipes-safe pipes-text + semigroupoids semigroups text transformers void + ]; + testHaskellDepends = [ + base doctest foldl free monoid-subclasses pipes tasty tasty-hunit + text + ]; + description = "Interfacing pipes with foldl folds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-vector" = callPackage ({ mkDerivation, base, monad-primitive, pipes, primitive , transformers, vector @@ -146170,6 +146750,28 @@ self: { license = "GPL"; }) {}; + "pkcs10" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, x509 + }: + mkDerivation { + pname = "pkcs10"; + version = "0.1.0.4"; + sha256 = "8d073426641e1cad88f7c40d7448b6fd2363765554ff89ef75519f96b07e7ba4"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + x509 + ]; + testHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + QuickCheck tasty tasty-hunit tasty-quickcheck x509 + ]; + homepage = "https://github.com/fcomb/pkcs10-hs#readme"; + description = "PKCS#10 library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pkcs7" = callPackage ({ mkDerivation, base, bytestring, Cabal, HUnit, QuickCheck }: mkDerivation { @@ -146299,6 +146901,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plist-buddy" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, cryptohash, directory, hspec, mtl, posix-pty, process + , QuickCheck, text, time, xml + }: + mkDerivation { + pname = "plist-buddy"; + version = "0.1.0.0"; + sha256 = "481cb13bacb3a0e5a9eee75bd78b793b30b048140d3d7a19eabc9ef6b33cc774"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring cryptohash + directory mtl posix-pty process text time xml + ]; + testHaskellDepends = [ + base bytestring directory hspec mtl posix-pty process QuickCheck + text time + ]; + description = "Remote monad for editing plists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plivo" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, errors , http-streams, http-types, io-streams, network-uri, old-locale @@ -146379,6 +147002,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-gtk_0_2_0_4" = callPackage + ({ mkDerivation, base, glib, gtk, hmatrix, mtl, plot, process }: + mkDerivation { + pname = "plot-gtk"; + version = "0.2.0.4"; + sha256 = "9c0a445162ae66c2badd8b6b0a760f5ee4ac4861852764eb4a550787de2c07bb"; + libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ]; + homepage = "http://code.haskell.org/plot"; + description = "GTK plots and interaction with GHCi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "plot-gtk-ui" = callPackage ({ mkDerivation, base, cairo, colour, fixed-vector, gtk, hmatrix , plot, text, vector @@ -146786,6 +147422,7 @@ self: { array base containers haskell-src-exts HUnit QuickCheck transformers ]; + jailbreak = true; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; }) {}; @@ -147166,12 +147803,11 @@ self: { ({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }: mkDerivation { pname = "polysoup"; - version = "0.6"; - sha256 = "e2fabbb647d28e07ce21f91f5cbecfc3f5fcabdd1a8299ec4b5748c54faff4b0"; + version = "0.6.2"; + sha256 = "bdb28b4e47cba223a9c9f3c3454b87e3210cdcd67af2cf570edcd4d8bc84e295"; libraryHaskellDepends = [ base containers deepseq polyparse tagsoup ]; - jailbreak = true; homepage = "https://github.com/kawu/polysoup"; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; @@ -147974,28 +148610,6 @@ self: { }) {}; "postgresql-schema" = callPackage - ({ mkDerivation, base, basic-prelude, optparse-applicative - , postgresql-simple, shelly, text, time, time-locale-compat - }: - mkDerivation { - pname = "postgresql-schema"; - version = "0.1.8"; - sha256 = "4ede410d51b86429f98b2a8fd61a49441df1030ef1e50444c841ea2ebbcb7962"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base basic-prelude postgresql-simple shelly text - ]; - executableHaskellDepends = [ - base basic-prelude optparse-applicative shelly text time - time-locale-compat - ]; - homepage = "https://github.com/mfine/postgresql-schema"; - description = "PostgreSQL Schema Management"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-schema_0_1_9" = callPackage ({ mkDerivation, base, basic-prelude, optparse-applicative , postgresql-simple, shelly, text, time, time-locale-compat }: @@ -148015,7 +148629,6 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple_0_4_8_0" = callPackage @@ -148121,6 +148734,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple_0_5_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, bytestring-builder, case-insensitive, containers + , cryptohash, hashable, HUnit, postgresql-libpq, scientific + , template-haskell, text, time, transformers, uuid-types, vector + }: + mkDerivation { + pname = "postgresql-simple"; + version = "0.5.1.2"; + sha256 = "d289eb7835b001550b9f9887e1fae050957797ead62394a85e6f5ae700976756"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-builder + case-insensitive containers hashable postgresql-libpq scientific + template-haskell text time transformers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring containers cryptohash HUnit + text time vector + ]; + description = "Mid-Level PostgreSQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-simple-migration" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, time @@ -148545,15 +149182,22 @@ self: { }) {}; "pred-trie" = callPackage - ({ mkDerivation, base, composition-extra, containers, mtl - , QuickCheck, semigroups, tries + ({ mkDerivation, base, composition-extra, deepseq, hashable, mtl + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tries, unordered-containers }: mkDerivation { pname = "pred-trie"; - version = "0.3.0"; - sha256 = "3ba01d64c41d8593d7fa84168879cf87398711c1b4d732866f87663958a70f38"; + version = "0.4.0"; + sha256 = "38e69ebc2be0a48d62949214a86b29a2657ca5cc0b99d14e681184318ee9689c"; libraryHaskellDepends = [ - base composition-extra containers mtl QuickCheck semigroups tries + base composition-extra hashable mtl QuickCheck semigroups tries + unordered-containers + ]; + testHaskellDepends = [ + base composition-extra deepseq hashable mtl QuickCheck + quickcheck-instances semigroups tasty tasty-hunit tasty-quickcheck + tries unordered-containers ]; doCheck = false; description = "Predicative tries"; @@ -150042,6 +150686,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "projectroot" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "projectroot"; + version = "0.1.0.1"; + sha256 = "bce014e23b028ca28597d0541e3a92616b4ce2409d4074bf14d21d5393549298"; + libraryHaskellDepends = [ base directory ]; + homepage = "https://gitlab.com/yamadapc/haskell-projectroot"; + description = "Bindings to the projectroot C logic"; + license = stdenv.lib.licenses.mit; + }) {}; + "prolog" = callPackage ({ mkDerivation, base, containers, mtl, parsec, syb , template-haskell, th-lift, transformers @@ -150441,7 +151097,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protocol-buffers" = callPackage + "protocol-buffers_2_1_9" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: @@ -150456,6 +151112,24 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "protocol-buffers" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.1.12"; + sha256 = "c863ce1729a4b8e8f5698f990942f1ddf569527893adb79b170a322eb3b8554e"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; }) {}; "protocol-buffers-descriptor_2_1_4" = callPackage @@ -150522,7 +151196,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protocol-buffers-descriptor" = callPackage + "protocol-buffers-descriptor_2_1_9" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -150531,6 +151205,22 @@ self: { libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; + jailbreak = true; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "protocol-buffers-descriptor" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.1.12"; + sha256 = "b8898165f0915b2b2865f6373c79d8c71c0fcbaa139c1f319a7d7f9168fc5c61"; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; @@ -150770,8 +151460,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20151129"; - sha256 = "a1b6dfca39241f124f2174dbf9368551e9d3bec1e52e9db0fc01ca98f1c2e06c"; + version = "0.20151212"; + sha256 = "7c45ec12c38607dea637a87f1e5de578e1d398f93377ad9e108afa0f53a16512"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -153556,7 +154246,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "raw-strings-qq" = callPackage + "raw-strings-qq_1_0_2" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "raw-strings-qq"; @@ -153566,6 +154256,20 @@ self: { homepage = "https://github.com/23Skidoo/raw-strings-qq"; description = "Raw string literals for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "raw-strings-qq" = callPackage + ({ mkDerivation, base, HUnit, template-haskell }: + mkDerivation { + pname = "raw-strings-qq"; + version = "1.1"; + sha256 = "2e011ec26aeaa53ab43c30b7d9b5b0f661f24b4ebef8884c12c571353c0fbed3"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/23Skidoo/raw-strings-qq"; + description = "Raw string literals for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "rawstring-qm" = callPackage @@ -154903,6 +155607,7 @@ self: { testHaskellDepends = [ base containers dependent-map MemoTrie mtl ref-tf ]; + jailbreak = true; homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -156599,17 +157304,16 @@ self: { "repl-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , exceptions, filepath, functor-monadic, ListLike, listsafe - , monad-loops, mtl, numericpeano, parsec, semigroupoids, text - , transformers + , monad-loops, mtl, parsec, semigroupoids, text, transformers }: mkDerivation { pname = "repl-toolkit"; - version = "0.5.0.0"; - sha256 = "781353e8eccb38ce0d068f754852d5d00e2f829a61d1e89660bdba4fc6811254"; + version = "1.0.0.1"; + sha256 = "f6b6c55a73c4408381204b22edf05a8b2681eef23ec7631c2a919b28609be79a"; libraryHaskellDepends = [ aeson base bytestring data-default directory exceptions filepath - functor-monadic ListLike listsafe monad-loops mtl numericpeano - parsec semigroupoids text transformers + functor-monadic ListLike listsafe monad-loops mtl parsec + semigroupoids text transformers ]; homepage = "https://github.com/ombocomp/repl-toolkit"; description = "Toolkit for quickly whipping up config files and command-line interfaces"; @@ -158573,6 +159277,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rev-state_0_1_1" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "rev-state"; + version = "0.1.1"; + sha256 = "844626648793fd5a939e85aa58a52bc3a9511398755b2012bb3e56164cfb9934"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/DanBurton/rev-state#readme"; + description = "Reverse State monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "revdectime" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -159354,23 +160072,21 @@ self: { }) {}; "rose-trees" = callPackage - ({ mkDerivation, base, containers, criterion, mtl, QuickCheck + ({ mkDerivation, base, containers, deepseq, mtl, QuickCheck , quickcheck-instances, semigroupoids, semigroups, sets, tasty , tasty-quickcheck, witherable }: mkDerivation { pname = "rose-trees"; - version = "0.0.2"; - sha256 = "4a8a9c8afc4bff994e1bd8230ba6534ccddcca4f5718507a99c1fbd491cd7fde"; - revision = "1"; - editedCabalFile = "43c7fc14a19af14fc5c244eeda5efea6e7279337c31580d7bd95b3cfa4e8bfab"; + version = "0.0.3"; + sha256 = "f373600456dc69e3d2acf3abd949781a7b0365b412084f98a1ca367cae01ee33"; libraryHaskellDepends = [ - base containers criterion mtl QuickCheck quickcheck-instances + base containers deepseq mtl QuickCheck quickcheck-instances semigroupoids semigroups sets witherable ]; testHaskellDepends = [ - base containers QuickCheck quickcheck-instances semigroupoids - semigroups sets tasty tasty-quickcheck witherable + base containers deepseq QuickCheck quickcheck-instances + semigroupoids semigroups sets tasty tasty-quickcheck witherable ]; description = "A collection of rose tree structures"; license = stdenv.lib.licenses.bsd3; @@ -160996,8 +161712,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "0.52.0"; - sha256 = "b4c4629044e230c950b5a71c7baf1226bec6ea68415d9e9c82b6c69f8fbddd7e"; + version = "0.52.1"; + sha256 = "72e53ab77cf026fc5bde9899a5a49a35bbe6a2e3853022b9d62e238eee8450f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162380,15 +163096,14 @@ self: { }: mkDerivation { pname = "sdl2-compositor"; - version = "1.2.0.1"; - sha256 = "55d3242e8b119b2cd0b4a5d198fb52c38bf36931aef30b6d250334373931a4a3"; + version = "1.2.0.3"; + sha256 = "c2f4ee694f2ee8444b6e2b5af51f0a86f415745181e7734e83dcc129cd655d12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lens linear lrucache QuickCheck sdl2 sdl2-ttf StateVar stm text transformers ]; - jailbreak = true; description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; @@ -164215,6 +164930,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-github" = callPackage + ({ mkDerivation, aeson, base, either, hspec, http-link-header + , QuickCheck, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "servant-github"; + version = "0.1.0.2"; + sha256 = "3d1c03791297bcde37c7ef369b0e672d00122ac17b4f176c6a3fa52a9dba4cd8"; + libraryHaskellDepends = [ + aeson base either http-link-header servant servant-client text + transformers + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/finlay/servant-github#readme"; + description = "Bindings to GitHub API using servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript , lens, servant, servant-server, stm, transformers, warp @@ -166016,6 +166749,8 @@ self: { pname = "shakespeare"; version = "2.0.7"; sha256 = "7a567d6effb68c7b39903fb1fccee54e6a1222a4746b5135da5623c406281668"; + revision = "1"; + editedCabalFile = "466ed38d1ca4b1fcc297793cfb3508c29b1ddb9714432c2f872ce7b656b1c57c"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -166577,7 +167312,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shelly" = callPackage + "shelly_1_6_4_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async , lifted-base, monad-control, mtl, process, system-fileio @@ -166606,6 +167341,38 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shelly" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async + , lifted-base, monad-control, mtl, process, system-fileio + , system-filepath, text, time, transformers, transformers-base + , unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.6.5"; + sha256 = "bdfd09b01f3de8e7e58e98591ab1a42ad5a74308ff29f19acd16d7cc85b71cdc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions hspec HUnit lifted-async lifted-base monad-control mtl + process system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + doCheck = false; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "shelly-extra" = callPackage @@ -168504,19 +169271,20 @@ self: { ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers , directory, filepath, http-conduit, http-types - , optparse-applicative, stringsearch, terminal-size, text - , transformers + , optparse-applicative, resourcet, stringsearch, terminal-size + , text, transformers }: mkDerivation { pname = "sloane"; - version = "4.1.0"; - sha256 = "3640b64b30dbc01fc1c1dddad0334a1930c6a708b80c8d91f03adee0bf60b17a"; + version = "4.1.2"; + sha256 = "3b02c1a095e23ba872bd8757bf0ef91362ce342f83e873496fe9166b639a09cc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal attoparsec base bloomfilter bytestring conduit conduit-extra containers directory filepath http-conduit http-types - optparse-applicative stringsearch terminal-size text transformers + optparse-applicative resourcet stringsearch terminal-size text + transformers ]; homepage = "http://github.com/akc/sloane"; description = "A command line interface to Sloane's OEIS"; @@ -169987,6 +170755,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snaplet-fay_0_3_3_13" = callPackage + ({ mkDerivation, aeson, base, bytestring, configurator, directory + , fay, filepath, mtl, snap, snap-core, transformers + }: + mkDerivation { + pname = "snaplet-fay"; + version = "0.3.3.13"; + sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f"; + libraryHaskellDepends = [ + aeson base bytestring configurator directory fay filepath mtl snap + snap-core transformers + ]; + homepage = "https://github.com/faylang/snaplet-fay"; + description = "Fay integration for Snap with request- and pre-compilation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snaplet-ghcjs" = callPackage ({ mkDerivation, base, directory, filepath, lens, mtl, process , snap, snap-core, string-conversions, transformers @@ -171267,7 +172053,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sourcemap" = callPackage + "sourcemap_0_1_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text , unordered-containers, utf8-string }: @@ -171283,9 +172069,10 @@ self: { ]; description = "Implementation of source maps as proposed by Google and Mozilla"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sourcemap_0_1_5" = callPackage + "sourcemap" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text , unordered-containers, utf8-string }: @@ -171300,9 +172087,9 @@ self: { testHaskellDepends = [ aeson base bytestring process text unordered-containers utf8-string ]; + doCheck = false; description = "Implementation of source maps as proposed by Google and Mozilla"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sousit" = callPackage @@ -173157,7 +173944,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_10_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-tagged, blaze-builder, byteable, bytestring, Cabal @@ -173223,6 +174010,76 @@ self: { homepage = "http://haskellstack.org"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-tagged, blaze-builder, byteable, bytestring, Cabal + , conduit, conduit-combinators, conduit-extra, containers + , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance + , either, email-validate, enclosed-exceptions, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify, gitrev + , hashable, hastache, hpc, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, project-template + , QuickCheck, resourcet, retry, safe, semigroups, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unix-compat + , unordered-containers, uuid, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.10.1"; + sha256 = "03d3f1cd03cbb70364f013aa6ccaefa07397a76984bc8b7ce51376e0bdc51a7c"; + revision = "3"; + editedCabalFile = "bc374c4faac1181394f1dfecfda9bf3d3e10176c2ff19410a36d12795a68d05b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-tagged blaze-builder + byteable bytestring Cabal conduit conduit-combinators conduit-extra + containers cryptohash cryptohash-conduit deepseq directory + edit-distance either email-validate enclosed-exceptions exceptions + extra fast-logger file-embed filelock filepath fsnotify hashable + hastache hpc http-client http-client-tls http-conduit http-types + lifted-base monad-control monad-logger monad-loops mtl old-locale + optparse-applicative path persistent persistent-sqlite + persistent-template pretty process project-template resourcet retry + safe semigroups split stm streaming-commons tar template-haskell + temporary text time transformers transformers-base unix unix-compat + unordered-containers uuid vector vector-binary-instances void word8 + yaml zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "http://haskellstack.org"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -173278,8 +174135,8 @@ self: { }: mkDerivation { pname = "stack-run-auto"; - version = "0.1.0.0"; - sha256 = "2233841a0e6fc3bf7fcf38d42899a7e9d89e3f0c3e02c3eda44279d1d711d0e0"; + version = "0.1.1.0"; + sha256 = "2656adb765aa9428868443709e29b6ee0846150f43b99a797272f5ad98b10917"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174364,6 +175221,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "statsd-client" = callPackage + ({ mkDerivation, base, byteable, bytestring, crypto-api, cryptohash + , digest-pure, DRBG, network, network-uri, old-time, random + , time-units + }: + mkDerivation { + pname = "statsd-client"; + version = "0.2.0.1"; + sha256 = "7ef148b3909594fe4e845a1ebc49041af5cacaf1c557b4460f117a35a59457a5"; + libraryHaskellDepends = [ + base byteable bytestring crypto-api cryptohash digest-pure DRBG + network network-uri old-time random time-units + ]; + homepage = "https://github.com/keithduncan/statsd-client"; + description = "Statsd UDP client"; + license = stdenv.lib.licenses.mit; + }) {}; + "statsd-datadog" = callPackage ({ mkDerivation, base, bytestring, monad-control, network, text , transformers-base @@ -174716,7 +175591,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-conduit" = callPackage + "stm-conduit_2_6_1" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit , conduit-combinators, conduit-extra, directory, doctest, ghc-prim , HUnit, lifted-async, lifted-base, monad-control, monad-loops @@ -174739,13 +175614,13 @@ self: { test-framework-quickcheck2 transformers ]; doHaddock = false; - doCheck = false; homepage = "https://github.com/wowus/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-conduit_2_7_0" = callPackage + "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit , conduit-combinators, conduit-extra, directory, doctest, ghc-prim , HUnit, lifted-async, lifted-base, monad-control, monad-loops @@ -174767,10 +175642,10 @@ self: { resourcet stm stm-chans test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + doHaddock = false; homepage = "https://github.com/wowus/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-containers_0_2_4" = callPackage @@ -174918,24 +175793,6 @@ self: { }) {}; "stm-firehose" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types - , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai - , wai-conduit, warp - }: - mkDerivation { - pname = "stm-firehose"; - version = "0.3.0"; - sha256 = "11c9d5e9d919b86efbb3cdd05e9889d3a648aae4d13c93ed0eabcc71d7452999"; - libraryHaskellDepends = [ - base blaze-builder conduit http-types resourcet stm stm-chans - stm-conduit transformers wai wai-conduit warp - ]; - testHaskellDepends = [ base hspec HUnit stm ]; - description = "Conduits and STM operations for fire hoses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stm-firehose_0_3_0_2" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai , wai-conduit, warp @@ -174952,7 +175809,6 @@ self: { homepage = "https://github.com/bartavelle/stm-firehose"; description = "Conduits and STM operations for fire hoses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-io-hooks" = callPackage @@ -176319,6 +177175,7 @@ self: { executableHaskellDepends = [ applicative-quoters base descriptive ghc-prim haskell-src-exts text ]; + jailbreak = true; homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -176596,6 +177453,7 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; @@ -176626,13 +177484,14 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell" = callPackage + "stylish-haskell_0_5_14_3" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb , test-framework, test-framework-hunit, yaml @@ -176656,12 +177515,14 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; 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_4" = 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 @@ -176685,11 +177546,9 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; - jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylized" = callPackage @@ -176816,8 +177675,8 @@ self: { }: mkDerivation { pname = "success"; - version = "0.2.2"; - sha256 = "0c1d6936db654b732c3eee92090b0454d0e0734308e07b28d52d22b25c54c859"; + version = "0.2.4"; + sha256 = "244ca46dd6b1a49ad765a36dcc1952c815ba12b33a2c3eb1c0c5e7ed1a2a3bf6"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -177230,8 +178089,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.0.3"; - sha256 = "9fd94d9aad09a26c4b6d4abf979d68d12b7265fbc8171093db448c620df96c49"; + version = "0.13.0.4"; + sha256 = "a366bb2592d9bd398183eefc9407442cfeaddd5b39e9f898081c788c691126a6"; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -177795,8 +178654,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.2"; - sha256 = "ed6ec0f95c7d4a63610317fe115a0380d75a39ffa1ef35529c96ca650bd433c4"; + version = "3.2.1"; + sha256 = "4e7a38e32637364913a6bc4f9f802fdcb7b5eb21f2a9a2083356f12e1129df46"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl template-haskell tree-view @@ -179697,10 +180556,8 @@ self: { }: mkDerivation { pname = "tasty-fail-fast"; - version = "0.0.1"; - sha256 = "c0bc9ed51c3f5d201ebcced0b4aeac0df48fcec7748fde9975ef15d8080f0808"; - revision = "1"; - editedCabalFile = "ac30bc385f5117e0d82d84786af687e8b282d5b325fce5d2a4d300673666aa44"; + version = "0.0.2"; + sha256 = "28e463b3e85e356f1a0676a4accd7ecc002814dc0487323613f0c6aacc153ac6"; libraryHaskellDepends = [ base containers stm tagged tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit tasty-tap @@ -181660,7 +182517,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath" = callPackage + "texmath_0_8_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb , temporary, text, utf8-string, xml @@ -181682,6 +182539,31 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "texmath" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, network-uri, pandoc-types, parsec, process, split, syb + , temporary, text, utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.8.4.1"; + sha256 = "45a9c779775e4e6effd7606bef5c179524b4fb88dca952c2decd3fa82e6c94f5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + executableHaskellDepends = [ network-uri ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; }) {}; "texrunner" = callPackage @@ -182232,6 +183114,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_2_1_2" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors + , bytestring, bytestring-builder, containers, generic-deriving + , ghc-prim, hspec, integer-gmp, nats, QuickCheck + , quickcheck-instances, semigroups, tagged, template-haskell, text + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "2.1.2"; + sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d"; + libraryHaskellDepends = [ + array base base-compat bytestring bytestring-builder containers + generic-deriving ghc-prim integer-gmp nats semigroups tagged + template-haskell text transformers void + ]; + testHaskellDepends = [ + array base base-compat base-orphans bifunctors bytestring + bytestring-builder generic-deriving ghc-prim hspec nats QuickCheck + quickcheck-instances tagged text transformers transformers-compat + void + ]; + jailbreak = true; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, ghc-prim, haskeline, hoopl, hpc, hspec @@ -183598,8 +184509,8 @@ self: { }: mkDerivation { pname = "tickle"; - version = "0.0.4"; - sha256 = "9261e1a6c3e3f317b6e9733a7d4e2ff2b3bad9669db4741d85e64e6fb933f587"; + version = "0.0.5"; + sha256 = "bf8c57ddea14842bc5e5e2099c5fbc8e9c85544f3daad57a33ba1db6fa244102"; libraryHaskellDepends = [ base bifunctors bytestring lens mtl semigroupoids semigroups transformers validation @@ -183607,7 +184518,7 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/nicta/tickle"; + homepage = "https://github.com/NICTA/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -184118,26 +185029,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timelike" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "timelike"; + version = "0.1.0"; + sha256 = "6588260531b2821ab33fb92b6587d971c68334f1b07daba56ebf7418641d6036"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://hub.darcs.net/esz/timelike"; + description = "Type classes for types representing time"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "timelike-time" = callPackage + ({ mkDerivation, base, time, timelike, transformers }: + mkDerivation { + pname = "timelike-time"; + version = "0.1.0"; + sha256 = "25c4b9ed4eb5ab0121973a2b54c19ec451c1ac9e0e54ce62f211814732ccca16"; + libraryHaskellDepends = [ base time timelike transformers ]; + homepage = "http://hub.darcs.net/esz/timelike-time"; + description = "Timelike interface for the time library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "timemap" = callPackage - ({ mkDerivation, base, containers, hashable, hashtables, QuickCheck - , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck - , time, unordered-containers + ({ mkDerivation, base, containers, focus, hashable, list-t + , QuickCheck, quickcheck-instances, stm, stm-containers, tasty + , tasty-hunit, tasty-quickcheck, time, unordered-containers }: mkDerivation { pname = "timemap"; - version = "0.0.0"; - sha256 = "f0b85eca4fdea0270897e0b15675f7894b193695968ddb6ac5f7acff73b64cc6"; + version = "0.0.2"; + sha256 = "089ec15bb8c6a4da17ef7619fa1b42dc4288ce630a261270f2ac6752a8387be4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hashable hashtables stm time unordered-containers + base containers focus hashable list-t stm stm-containers time + unordered-containers ]; executableHaskellDepends = [ - base containers hashable hashtables stm time unordered-containers + base containers focus hashable list-t stm stm-containers time + unordered-containers ]; testHaskellDepends = [ - base containers hashable hashtables QuickCheck quickcheck-instances - stm tasty tasty-hunit tasty-quickcheck time unordered-containers + base containers focus hashable list-t QuickCheck + quickcheck-instances stm stm-containers tasty tasty-hunit + tasty-quickcheck time unordered-containers ]; description = "A mutable hashmap, implicitly indexed by UTCTime"; license = stdenv.lib.licenses.bsd3; @@ -184480,8 +185418,8 @@ self: { }: mkDerivation { pname = "tip-lib"; - version = "0.2.1"; - sha256 = "007beb1850acd1aeb370c831f9e801e580e96d295b5b3750db47e8e658c207f8"; + version = "0.2.2"; + sha256 = "66698d1000e582542f3ef838960edc66ae3874eb6b21f169ed8497fd2c2cc12b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184567,16 +185505,13 @@ self: { }) {}; "tld" = callPackage - ({ mkDerivation, base, containers, network-uri, template-haskell - , text - }: + ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.2.0.0"; - sha256 = "3d02c17a2f330e21e840177fccc539d78347340125992aaa6238ab9f2b2456e9"; - libraryHaskellDepends = [ - base containers network-uri template-haskell text - ]; + version = "0.3.0.0"; + sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e"; + libraryHaskellDepends = [ base containers network-uri text ]; + testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; }) {}; @@ -184794,8 +185729,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.3.3"; - sha256 = "9f03fb059198e1f3d866d1297f86fca3204d07e7cc5e8f7e8ad878be48f1ca24"; + version = "1.3.4"; + sha256 = "49fff2bd6b420bb57f7cc78445f9a17547a5ff4a72e29135695c9cc2d91e19c1"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class memory mtl network transformers x509 x509-store @@ -185981,28 +186916,55 @@ self: { "tries" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, composition - , composition-extra, containers, criterion, keys, mtl, QuickCheck - , quickcheck-instances, rose-trees, semigroups, sets, tasty - , tasty-quickcheck + , composition-extra, containers, deepseq, hashable, keys, mtl + , QuickCheck, quickcheck-instances, rose-trees, semigroups, sets + , tasty, tasty-quickcheck, unordered-containers }: mkDerivation { pname = "tries"; - version = "0.0.2"; - sha256 = "ce556583fe46ec5bf0d980dd7d5c8dfefb451989d60c9f772a7f83ef57ce394e"; + version = "0.0.3"; + sha256 = "45a90df3926415f24454fdeaf838d3982c8c441d4582b635a13f5f5ba1319971"; libraryHaskellDepends = [ base bytestring bytestring-trie composition composition-extra - containers criterion keys mtl QuickCheck quickcheck-instances - rose-trees semigroups sets + containers deepseq hashable keys QuickCheck quickcheck-instances + rose-trees semigroups sets unordered-containers ]; testHaskellDepends = [ base bytestring bytestring-trie composition composition-extra - containers keys mtl QuickCheck quickcheck-instances rose-trees - semigroups sets tasty tasty-quickcheck + containers deepseq hashable keys mtl QuickCheck + quickcheck-instances rose-trees semigroups sets tasty + tasty-quickcheck unordered-containers ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; + "tries_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, bytestring-trie, composition + , composition-extra, containers, deepseq, hashable, keys, mtl + , QuickCheck, quickcheck-instances, rose-trees, semigroups, sets + , tasty, tasty-quickcheck, unordered-containers + }: + mkDerivation { + pname = "tries"; + version = "0.0.4"; + sha256 = "6be9638a03b35effe69c9bbfc33b00fe92156211945b83dee871e70cf266f94a"; + libraryHaskellDepends = [ + base bytestring bytestring-trie composition composition-extra + containers deepseq hashable keys QuickCheck quickcheck-instances + rose-trees semigroups sets unordered-containers + ]; + testHaskellDepends = [ + base bytestring bytestring-trie composition composition-extra + containers deepseq hashable keys mtl QuickCheck + quickcheck-instances rose-trees semigroups sets tasty + tasty-quickcheck unordered-containers + ]; + description = "Various trie implementations in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trifecta_1_5_1_3" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset @@ -187366,21 +188328,33 @@ self: { }) {}; "type-combinators" = callPackage - ({ mkDerivation, base, containers, mtl, template-haskell - , transformers - }: + ({ mkDerivation, base }: mkDerivation { pname = "type-combinators"; - version = "0.1.2.1"; - sha256 = "67e8b5b1a92a4e578ab741d11ad883587dbf4451dc5a14774733181e0e570420"; - libraryHaskellDepends = [ - base containers mtl template-haskell transformers - ]; + version = "0.2.0.0"; + sha256 = "0b0b07f8ac2bc3237114753f8f9e2d8f41cdc4c97d3bd5cd4725beaaa4b7c99a"; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/kylcarte/type-combinators"; description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; }) {}; + "type-combinators-quote" = callPackage + ({ mkDerivation, base, haskell-src-meta, template-haskell + , type-combinators + }: + mkDerivation { + pname = "type-combinators-quote"; + version = "0.1.0.0"; + sha256 = "246e8b50dbcebb5bf2c71c8827c66dc740a2e717dac4210da86308c7946c620d"; + libraryHaskellDepends = [ + base haskell-src-meta template-haskell type-combinators + ]; + homepage = "https://github.com/kylcarte/type-combinators-quote"; + description = "Quasiquoters for the 'type-combinators' package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-digits" = callPackage ({ mkDerivation, base, template-haskell, type-spine }: mkDerivation { @@ -187876,6 +188850,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-wire-utils" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, text + , time + }: + mkDerivation { + pname = "typed-wire-utils"; + version = "0.1.0.0"; + sha256 = "26edf29617e27d569f4e44d88b0aadc7d028476ae5eb9dbabbb7c605a71ab230"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring text time + ]; + homepage = "http://github.com/typed-wire/hs-typed-wire-utils#readme"; + description = "Haskell utility library required for code generated by typed-wire compiler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typedquery" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec , template-haskell, text, transformers @@ -188050,8 +189040,10 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.0.0.10"; - sha256 = "1597ab0c2b6606492b65d2c39be5ae8dcf50734dee2cd4e0de5b691241544096"; + version = "0.1.0.1"; + sha256 = "2efcdae6fbeb7986ae5486de1eb090d646d60519070006379f40e72678fd490c"; + revision = "1"; + editedCabalFile = "485b8652e895108a5c360180fe992cc0f7583889c6d88cd749bf68cfde8f0baa"; libraryHaskellDepends = [ base binary bytestring containers deepseq template-haskell time tzdata vector @@ -188061,7 +189053,6 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th time tzdata unix vector ]; - jailbreak = true; homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; @@ -188110,23 +189101,20 @@ self: { }) {}; "ua-parser" = callPackage - ({ mkDerivation, aeson, base, bytestring, criterion, data-default - , deepseq, derive, file-embed, filepath, HUnit, pcre-light, syb - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, yaml + ({ mkDerivation, aeson, base, bytestring, data-default, derive + , file-embed, filepath, HUnit, pcre-light, tasty, tasty-hunit + , tasty-quickcheck, text, yaml }: mkDerivation { pname = "ua-parser"; - version = "0.5"; - sha256 = "6e5925c3b4c7e195801dc4b9fcd240717e25d138fa14ae03b01eff97f476923a"; + version = "0.7"; + sha256 = "586ae0c948af8a2c671331aeebe85c663a24e5d40c8a71a943ee2520b4d4aa57"; libraryHaskellDepends = [ - aeson base bytestring data-default file-embed pcre-light syb text - yaml + aeson base bytestring data-default file-embed pcre-light text yaml ]; testHaskellDepends = [ - aeson base bytestring criterion data-default deepseq derive - file-embed filepath HUnit pcre-light syb test-framework - test-framework-hunit test-framework-quickcheck2 text yaml + aeson base bytestring data-default derive file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml ]; jailbreak = true; description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; @@ -188570,6 +189558,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unbreak" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, cereal, cmdargs, cryptonite, memory, process, text + , unix + }: + mkDerivation { + pname = "unbreak"; + version = "0.3.0"; + sha256 = "63de23dd0adf5183498b6ba37efe5bc867d935b5a56b839d4ae553d8918ec91c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring cereal + cryptonite memory process text unix + ]; + executableHaskellDepends = [ base bytestring cmdargs ]; + description = "Secure editing of remote documents with unstable connection"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "unexceptionalio" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -188832,10 +189840,8 @@ self: { }: mkDerivation { pname = "uniform-io"; - version = "1.0.0.0"; - sha256 = "758c265cc4838f2536c9adfe0c4e0e3839b4c29c2241ad89ab941925a62ceb1e"; - revision = "1"; - editedCabalFile = "7646b537e81dab11156af68670fd508a81521543536f1fe3e4d45c545616f6be"; + version = "1.0.1.0"; + sha256 = "6c772b6b8a6876e41935267a789dfc466fdccc3f78e80098eabcacaf0675cc76"; libraryHaskellDepends = [ attoparsec base bytestring data-default-class iproute network transformers word8 @@ -190281,13 +191287,13 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.2.2"; - sha256 = "21d4ee5ccf8643b41288ffb4bae5180ff1e94fe81ee2b56461fe1f345c9bdffb"; + version = "0.1.2.3"; + sha256 = "7d1e9e276ff47ec4717d74432075c568b6859388c8a74057f3efa1a9e80106a3"; libraryHaskellDepends = [ aeson base boomerang lens safecopy web-routes web-routes-th ]; homepage = "http://www.github.com/Happstack/userid"; - description = "A library which provides the UserId type and useful instances for web development"; + description = "The UserId type and useful instances for web development"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -191180,8 +192186,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.5"; - sha256 = "7262e756a473b28f3998c6f90c8c04437e77efe5fc7e13f72fd06388ca65781d"; + version = "0.0.6"; + sha256 = "cc9b6ffa83eaedf2c793a93e47b8341b2f8014382aaae63a46b4028c3e86212c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192850,8 +193856,8 @@ self: { ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, pango, vte }: mkDerivation { pname = "vte"; - version = "0.13.0.2"; - sha256 = "70e8f81e5e44beb9eba66959792af7648ab9238c758ed359bda3f78933427ef0"; + version = "0.13.0.3"; + sha256 = "70efa9daec459aa3d7d49e767af2449752c62f47985d5bac9ef50fc1cdb4f90f"; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -192864,8 +193870,8 @@ self: { ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }: mkDerivation { pname = "vtegtk3"; - version = "0.13.0.2"; - sha256 = "ef3b367f9806012308816bb6315a56c0f51f5648f6f60a3726ac5a54b4b97536"; + version = "0.13.0.3"; + sha256 = "d712bf11446133f3146985db6ced3d932cf8f65d6a81900f4b65bb6e914c176a"; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -194488,6 +195494,55 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-caching" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, wai }: + mkDerivation { + pname = "wai-middleware-caching"; + version = "0.1.0.1"; + sha256 = "831cf0efc1fcbf5a43ef19f313427f1fcca1d3d5312f7cf4e05294984ccd3d83"; + libraryHaskellDepends = [ base blaze-builder bytestring wai ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching#readme"; + description = "WAI Middleware to cache things"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wai-middleware-caching-lru" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, http-types + , lrucache, text, wai, wai-middleware-caching + }: + mkDerivation { + pname = "wai-middleware-caching-lru"; + version = "0.1.0.0"; + sha256 = "377dc842f5ad77b98e8a817e092c891ccfd0da978fb9f69a380f001a95da28d3"; + libraryHaskellDepends = [ + base blaze-builder bytestring http-types lrucache text wai + wai-middleware-caching + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching-lru#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wai-middleware-caching-redis" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, hedis, http-types + , text, wai, wai-middleware-caching + }: + mkDerivation { + pname = "wai-middleware-caching-redis"; + version = "0.2.0.0"; + sha256 = "6ff53783db20d8f0ff00514ea2679f7022ca59eb20ffad22628ac17c13bf7c4c"; + libraryHaskellDepends = [ + base blaze-builder bytestring hedis http-types text wai + wai-middleware-caching + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching-redis#readme"; + description = "Cache Wai Middleware using Redis backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-catch" = callPackage ({ mkDerivation, base, bytestring, http-types, lifted-base, wai }: mkDerivation { @@ -194534,36 +195589,38 @@ self: { "wai-middleware-content-type" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, containers, exceptions, hspec, hspec-wai, http-media + , clay, exceptions, hashable, hspec, hspec-wai, http-media , http-types, lucid, mmorph, monad-control, monad-logger, mtl , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, urlpath, wai - , wai-transformers, wai-util, warp + , text, transformers, transformers-base, unordered-containers + , urlpath, wai, wai-transformers, wai-util, warp }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.1.0.1"; - sha256 = "4c2fe853b078648b2f916da3fd174d5cfa01153edd136e587f4aae54cf1c579e"; + version = "0.1.1.1"; + sha256 = "a2b7855f48904918133311c1498e0b028d4cf8b6c0c45d660872198fbcd50b40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay containers - exceptions http-media http-types lucid mmorph monad-control + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable http-media http-types lucid mmorph monad-control monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base urlpath wai wai-transformers wai-util + transformers-base unordered-containers urlpath wai wai-transformers + wai-util ]; executableHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay containers - exceptions http-media http-types lucid mmorph monad-control + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable http-media http-types lucid mmorph monad-control monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base urlpath wai wai-transformers wai-util warp + transformers-base unordered-containers urlpath wai wai-transformers + wai-util warp ]; testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay containers - exceptions hspec hspec-wai http-media http-types lucid mmorph + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable hspec hspec-wai http-media http-types lucid mmorph monad-control monad-logger mtl pandoc pandoc-types resourcet shakespeare tasty tasty-hspec text transformers transformers-base - urlpath wai wai-transformers wai-util warp + unordered-containers urlpath wai wai-transformers wai-util warp ]; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; @@ -194599,7 +195656,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd" = callPackage + "wai-middleware-crowd_0_1_2_1" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls @@ -194626,10 +195683,10 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd_0_1_3" = callPackage + "wai-middleware-crowd" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls @@ -194656,7 +195713,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "wai-middleware-etag" = callPackage @@ -194959,17 +196016,26 @@ self: { }) {}; "wai-middleware-verbs" = callPackage - ({ mkDerivation, base, containers, errors, exceptions, http-types - , mmorph, monad-logger, mtl, resourcet, transformers - , transformers-base, wai, wai-transformers + ({ mkDerivation, base, errors, exceptions, hashable, http-types + , mmorph, monad-logger, mtl, resourcet, text, transformers + , transformers-base, unordered-containers, wai + , wai-middleware-content-type, wai-transformers, warp }: mkDerivation { pname = "wai-middleware-verbs"; - version = "0.1.0"; - sha256 = "af304d24cf761465cae236b4a8d59a05cd8d74870a8c96f76f5b7fcbbab7d88e"; + version = "0.1.1"; + sha256 = "cc1e6be505f4c23f45467d55d55497d844f8c79cd2d855a23d191351e1126184"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base containers errors exceptions http-types mmorph monad-logger - mtl resourcet transformers transformers-base wai wai-transformers + base errors exceptions hashable http-types mmorph monad-logger mtl + resourcet transformers transformers-base unordered-containers wai + wai-transformers + ]; + executableHaskellDepends = [ + base errors exceptions hashable http-types mmorph monad-logger mtl + resourcet text transformers transformers-base unordered-containers + wai wai-middleware-content-type wai-transformers warp ]; description = "Route different middleware responses based on the incoming HTTP verb"; license = stdenv.lib.licenses.bsd3; @@ -195228,27 +196294,21 @@ self: { }) {}; "wai-session-postgresql" = callPackage - ({ mkDerivation, base, bytestring, cereal, data-default, entropy - , http-types, postgresql-session, postgresql-simple, text, time - , transformers, vault, wai, wai-session, warp + ({ mkDerivation, base, bytestring, cereal, cookie, entropy + , postgresql-session, postgresql-simple, text, time, transformers + , wai, wai-session }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.1.0.1"; - sha256 = "3a0651e2757d4a83d8dac6aebc61607b38207549dbdb2904ccbd0f410785bdfe"; - isLibrary = true; - isExecutable = true; + version = "0.1.1.0"; + sha256 = "4a4adeddde9b3c6fe54599daa18a0d9abe8386fdd594475913d79658f29b8a58"; libraryHaskellDepends = [ - base bytestring cereal entropy postgresql-simple text time - transformers wai-session - ]; - executableHaskellDepends = [ - base bytestring data-default entropy http-types postgresql-simple - text vault wai wai-session warp + base bytestring cereal cookie entropy postgresql-simple text time + transformers wai wai-session ]; testHaskellDepends = [ base postgresql-session ]; jailbreak = true; - homepage = "https://github.com/hce/postgresql-session"; + homepage = "https://github.com/hce/postgresql-session#readme"; description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -197203,19 +198263,16 @@ self: { }) {}; "webcrank-dispatch" = callPackage - ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text + ({ mkDerivation, base, hvect, mtl, path-pieces, reroute, text , unordered-containers }: mkDerivation { pname = "webcrank-dispatch"; - version = "0.1"; - sha256 = "f324088d07a0986b982a73d931b98f8276eda379e2715f48233c9a262a7393f0"; - revision = "1"; - editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8"; + version = "0.2"; + sha256 = "13328e0f7570a29b9938b8effecc6eeadd3d14555cbefc6e3707c98d7695b7ae"; libraryHaskellDepends = [ - base bytestring mtl path-pieces reroute text unordered-containers + base hvect mtl path-pieces reroute text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/webcrank/webcrank-dispatch.hs"; description = "A simple request dispatcher"; license = stdenv.lib.licenses.bsd3; @@ -197511,6 +198568,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "webfinger-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default-class + , hashable, http-client, http-client-tls, http-types, text + , unordered-containers, uri-bytestring + }: + mkDerivation { + pname = "webfinger-client"; + version = "0.1.0.0"; + sha256 = "e3b1a231ebe4bc957eddcf24a19ee5d90134b9a95984a75a945c8dc4b17a56e0"; + libraryHaskellDepends = [ + aeson base bytestring data-default-class hashable http-client + http-client-tls http-types text unordered-containers uri-bytestring + ]; + homepage = "http://hub.darcs.net/fr33domlover/webfinger-client"; + description = "WebFinger client library"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -197561,8 +198636,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.14.1.0"; - sha256 = "249fb5e5817e3f85a17abe32f100aafc9f853c6cf83f30a11c9adf846dd3b4d6"; + version = "0.14.1.1"; + sha256 = "c80dd015ecbf02b7d018afd1679df78a8c1ce17e3ae6b943f23d4da2ef867e44"; libraryHaskellDepends = [ base bytestring cairo glib gtk mtl pango text transformers ]; @@ -197577,8 +198652,8 @@ self: { ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkit-javascriptcore"; - version = "0.13.1.0"; - sha256 = "b0a7c41c9c22cb1aa4697e6d30ace424bc73b15416cf98790e148c9bec10bed7"; + version = "0.13.1.1"; + sha256 = "c54491817b539f2ae5ff75f082ff18efc68038146553e300462a3a8d808ff730"; libraryHaskellDepends = [ base glib gtk webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; @@ -197592,8 +198667,8 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.14.1.0"; - sha256 = "d5d293fff2a7df1e870c6076dc4cafbe7bbc07098a3f66c81942c01e0ebbbe99"; + version = "0.14.1.1"; + sha256 = "a8edd6470fe9a6c82f98bc331d23f6c6fb6978b6d63f03f010e0c7e1000eb216"; libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; @@ -197610,8 +198685,8 @@ self: { }: mkDerivation { pname = "webkitgtk3-javascriptcore"; - version = "0.13.1.0"; - sha256 = "caf9cc5074e51f27abb3ea52f60b8e737ca7323b96bf0862ba1713354bf835b5"; + version = "0.13.1.1"; + sha256 = "0a1583d61f20c8cf0f84443210711222a9f0dc1d8a99a85944c01f487aaa8b79"; libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ]; libraryPkgconfigDepends = [ webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; @@ -198675,14 +199750,14 @@ self: { , amazonka-swf, base, basic-prelude, bytestring, conduit , conduit-extra, exceptions, fast-logger, formatting, http-conduit , http-types, lens, monad-control, monad-logger, mtl, mtl-compat - , optparse-applicative, resourcet, safe, shelly, tasty, tasty-hunit - , text, time, transformers, transformers-base, unordered-containers - , uuid, yaml + , optparse-applicative, resourcet, safe, shelly, system-filepath + , tasty, tasty-hunit, text, time, transformers, transformers-base + , unordered-containers, uuid, yaml, zlib }: mkDerivation { pname = "wolf"; - version = "0.2.2"; - sha256 = "73a4d33c24eef17da4f09544f478a65ab73935cc720f94d7a62977917b80428b"; + version = "0.2.3"; + sha256 = "53c53f00ccc4ad27efc9164d90722174d28f7bad1850a1659f177d9c4d070fd3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198695,7 +199770,8 @@ self: { ]; executableHaskellDepends = [ aeson amazonka-core base basic-prelude bytestring - optparse-applicative resourcet shelly text transformers yaml + optparse-applicative resourcet shelly system-filepath text + transformers yaml zlib ]; testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "https://github.com/swift-nav/wolf"; @@ -200247,8 +201323,8 @@ self: { }: mkDerivation { pname = "xkbcommon"; - version = "0.0.1"; - sha256 = "2503e70f4a602c7c9d77b998ced4888a28e9d793323f41af970808f34d091bb2"; + version = "0.0.2"; + sha256 = "98e0a2e42bc6a08a56416882a89165adfdf12a762fd93ece076edf37b814dfd8"; libraryHaskellDepends = [ base bytestring cpphs data-flags filepath process storable-record template-haskell text transformers @@ -200434,6 +201510,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_2_0" = callPackage + ({ mkDerivation, base, binary-search, bytestring, conduit + , containers, data-default, digest, HUnit, lens, mtl, old-locale + , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time + , transformers, utf8-string, vector, xml-conduit, xml-types + , zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.2.0"; + sha256 = "6f76eefb933916fe14569a5dfb408716cb5e9481be34f886219f770d64fa16de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary-search bytestring conduit containers data-default + digest lens mtl old-locale text time transformers utf8-string + vector xml-conduit xml-types zip-archive zlib + ]; + executableHaskellDepends = [ + base binary-search bytestring conduit containers data-default + digest lens old-locale text time transformers utf8-string vector + xml-conduit xml-types zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit lens smallcheck tasty tasty-hunit + tasty-smallcheck time vector xml-conduit + ]; + homepage = "https://github.com/qrilka/xlsx"; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-templater" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, parsec, text, time, transformers, xlsx @@ -202518,16 +203627,13 @@ self: { ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }: mkDerivation { pname = "yampa-canvas"; - version = "0.2"; - sha256 = "8ac4654effc73092ab61e13655d74363744f37e998a9a68b6024db7c825ff49a"; + version = "0.2.2"; + sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; - executableHaskellDepends = [ - base blank-canvas stm text time Yampa - ]; - jailbreak = true; - description = "blank-canvas frontend for yampa"; + executableHaskellDepends = [ base blank-canvas text Yampa ]; + description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -205839,18 +206945,21 @@ self: { }) {}; "yesod-csp" = callPackage - ({ mkDerivation, base, hspec, network-uri, semigroups, text, yesod - , yesod-core, yesod-test + ({ mkDerivation, attoparsec, base, hspec, mono-traversable + , network-uri, semigroups, syb, template-haskell, text, uniplate + , yesod, yesod-core, yesod-test }: mkDerivation { pname = "yesod-csp"; - version = "0.1.1.0"; - sha256 = "02338c3b027e18381f098d450b2431ea1127ec49c77fc6e25fcab36f0a84ca94"; + version = "0.2.0.0"; + sha256 = "3804bdbc7b2f40a707c0af2bd6c2586abdc49c0f2eada5b24c488ed126e37280"; libraryHaskellDepends = [ - base network-uri semigroups text yesod yesod-core + attoparsec base mono-traversable network-uri semigroups syb + template-haskell text uniplate yesod yesod-core ]; testHaskellDepends = [ - base hspec network-uri semigroups yesod yesod-test + attoparsec base hspec network-uri semigroups template-haskell yesod + yesod-test ]; description = "Add CSP headers to Yesod apps"; license = stdenv.lib.licenses.mit; From 1ba77bf6cb0f38bf21510623ac4ce59e0c1496b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Dec 2015 21:27:13 +0100 Subject: [PATCH 491/498] Add LTS Haskell 3.17. --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 997baa7eaa9..c35ee45204d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -304,6 +304,9 @@ rec { lts-3_16 = packages.ghc7102.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.16.nix { }; }; + lts-3_17 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.17.nix { }; + }; }; } From db52259a9df5a513bd8fb3fe8113e327bb88d411 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Dec 2015 19:28:35 +0100 Subject: [PATCH 492/498] Add LTS Haskell 3.18. --- pkgs/top-level/haskell-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c35ee45204d..ad29a94b199 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -307,6 +307,9 @@ rec { lts-3_17 = packages.ghc7102.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.17.nix { }; }; + lts-3_18 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.18.nix { }; + }; }; } From c58c68a037e9d24b05a78003348e20d2f19e0216 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 21:49:33 +0100 Subject: [PATCH 493/498] haskell.lib.addPkgconfigDepends: fix broken function The function is supposed to modify pkgconfigDepends, not buildInputs. --- pkgs/development/haskell-modules/lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 7ac30668d8f..a3e1b56104d 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -33,7 +33,7 @@ rec { addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; }); addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; - addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; From fc2b8edb1a087fcd199c70851c950ffd90002a44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Dec 2015 21:58:45 +0100 Subject: [PATCH 494/498] Clean up overrides for Haskell gio, glib, and gtk. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41fdfad528a..4a164beb246 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -248,9 +248,13 @@ self: super: { jwt = dontCheck super.jwt; # https://github.com/NixOS/cabal2nix/issues/136 - glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; + gio = addPkgconfigDepend super.gio pkgs.glib; + gio_0_13_0_3 = addPkgconfigDepend super.gio_0_13_0_3 pkgs.glib; + gio_0_13_0_4 = addPkgconfigDepend super.gio_0_13_0_4 pkgs.glib; + gio_0_13_1_0 = addPkgconfigDepend super.gio_0_13_1_0 pkgs.glib; + glib = addPkgconfigDepend super.glib pkgs.glib; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; - gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk]; + gtk = addPkgconfigDepend super.gtk pkgs.gtk; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; # Need WebkitGTK, not just webkit. From 61176d89873543ab0c805b1d193c078a6bc34c4a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 16:20:44 -0800 Subject: [PATCH 495/498] Revert "haskellPackages.git-annex: Do not use lsof on Darwin" This reverts commit fd45c7b82b65c31a5be7854d8566260b781c6d6b. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a164beb246..f7fe236da35 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -66,13 +66,11 @@ self: super: { # build which has the assistant to be used in the top-level. git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; - lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; git-annex = (disableCabalFlag super.git-annex "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; - lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; From 09aff6c104eba3f68f0a8054834376db505af62e Mon Sep 17 00:00:00 2001 From: Matthew O'Gorman Date: Mon, 16 Nov 2015 15:44:25 -0600 Subject: [PATCH 496/498] pcb: init at 20140316 --- .../science/electronics/pcb/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/electronics/pcb/default.nix diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix new file mode 100644 index 00000000000..257d6993ff5 --- /dev/null +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, gtk, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome, pangox_compat, gd, xorg }: + +stdenv.mkDerivation rec { + name = "pcb-${version}"; + version = "20140316"; + + src = fetchurl { + url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz"; + sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; + }; + + buildInputs = [ pkgconfig gtk bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome.gtkglext pangox_compat gd xorg.libXmu ]; + + configureFlags = ["--disable-update-desktop-database"]; + + meta = with stdenv.lib; { + description = "Printed Circuit Board editor"; + homepage = http://pcb.geda-project.org/; + maintainers = with maintainers; [ mog ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b217170baab..1fb1dbaf3c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14845,6 +14845,8 @@ let ngspice = callPackage ../applications/science/electronics/ngspice { }; + pcb = callPackage ../applications/science/electronics/pcb { }; + qucs = callPackage ../applications/science/electronics/qucs { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; From 0a81a0d8ffa824217e0a2fe58972467a7a92b966 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 19:08:06 -0600 Subject: [PATCH 497/498] kde5: Frameworks 5.17, Plasma 5.5.1, Applications 15.12.0 The stable `kde5` attribute is updated to these versions. The old versions have been removed. --- pkgs/applications/kde-apps-15.08/ark.nix | 58 - .../kde-apps-15.08/baloo-widgets.nix | 35 - pkgs/applications/kde-apps-15.08/default.nix | 56 - .../kde-apps-15.08/dolphin-plugins.nix | 31 - pkgs/applications/kde-apps-15.08/dolphin.nix | 70 - pkgs/applications/kde-apps-15.08/fetchsrcs.sh | 56 - .../kde-apps-15.08/ffmpegthumbs.nix | 27 - pkgs/applications/kde-apps-15.08/gpgmepp.nix | 21 - pkgs/applications/kde-apps-15.08/gwenview.nix | 44 - pkgs/applications/kde-apps-15.08/kate.nix | 69 - pkgs/applications/kde-apps-15.08/kde-app.nix | 23 - .../kde-apps-15.08/kde-locale-4.nix | 20 - .../kde-apps-15.08/kde-locale-5.nix | 17 - .../kdegraphics-thumbnailers.nix | 29 - .../0001-old-kde4-cmake-policies.patch | 56 - .../kdelibs/0002-polkit-install-path.patch | 25 - .../kdelibs/0003-remove_xdg_impurities.patch | 47 - .../kde-apps-15.08/kdelibs/default.nix | 43 - .../kdelibs/polkit-install.patch | 12 - .../kde-apps-15.08/kdelibs/setup-hook.sh | 10 - pkgs/applications/kde-apps-15.08/kgpg.nix | 38 - pkgs/applications/kde-apps-15.08/konsole.nix | 68 - .../applications/kde-apps-15.08/ksnapshot.nix | 29 - pkgs/applications/kde-apps-15.08/l10n.nix | 231 -- .../applications/kde-apps-15.08/libkdcraw.nix | 27 - .../applications/kde-apps-15.08/libkexiv2.nix | 27 - pkgs/applications/kde-apps-15.08/libkipi.nix | 25 - pkgs/applications/kde-apps-15.08/okular.nix | 41 - .../kde-apps-15.08/oxygen-icons.nix | 13 - .../kde-apps-15.08/print-manager.nix | 47 - pkgs/applications/kde-apps-15.08/srcs.nix | 1981 ----------------- pkgs/desktops/plasma-5.4/bluedevil.nix | 23 - pkgs/desktops/plasma-5.4/breeze-qt4.nix | 29 - pkgs/desktops/plasma-5.4/breeze-qt5.nix | 21 - pkgs/desktops/plasma-5.4/default.nix | 86 - pkgs/desktops/plasma-5.4/fetchsrcs.sh | 57 - pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 27 - .../kde-gtk-config/0001-follow-symlinks.patch | 39 - .../plasma-5.4/kde-gtk-config/default.nix | 28 - pkgs/desktops/plasma-5.4/kdecoration.nix | 6 - pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 21 - pkgs/desktops/plasma-5.4/kgamma5.nix | 9 - pkgs/desktops/plasma-5.4/khelpcenter.nix | 20 - pkgs/desktops/plasma-5.4/khotkeys.nix | 16 - pkgs/desktops/plasma-5.4/kinfocenter.nix | 24 - pkgs/desktops/plasma-5.4/kmenuedit.nix | 19 - pkgs/desktops/plasma-5.4/kscreen.nix | 22 - pkgs/desktops/plasma-5.4/ksshaskpass.nix | 13 - pkgs/desktops/plasma-5.4/ksysguard.nix | 21 - pkgs/desktops/plasma-5.4/kwayland.nix | 14 - .../0001-qdiriterator-follow-symlinks.patch | 25 - pkgs/desktops/plasma-5.4/kwin/default.nix | 33 - pkgs/desktops/plasma-5.4/kwrited.nix | 10 - .../plasma-5.4/libkscreen/default.nix | 18 - .../libkscreen/libkscreen-backend-path.patch | 130 -- .../0001-qdiriterator-follow-symlinks.patch | 25 - .../plasma-5.4/libksysguard/default.nix | 21 - pkgs/desktops/plasma-5.4/milou.nix | 17 - pkgs/desktops/plasma-5.4/oxygen-fonts.nix | 12 - pkgs/desktops/plasma-5.4/oxygen.nix | 20 - .../plasma-desktop/0001-hwclock.patch | 36 - .../plasma-desktop/0002-zoneinfo.patch | 30 - .../0003-qt-5.5-QML-import-paths.patch | 67 - .../plasma-5.4/plasma-desktop/default.nix | 59 - .../plasma-5.4/plasma-mediacenter.nix | 23 - ...-mobile-broadband-provider-info-path.patch | 25 - .../desktops/plasma-5.4/plasma-nm/default.nix | 36 - pkgs/desktops/plasma-5.4/plasma-pa.nix | 17 - .../plasma-workspace-wallpapers.nix | 10 - .../0001-startkde-NixOS-patches.patch | 401 ---- .../0002-qt-5.5-QML-import-paths.patch | 123 - .../plasma-5.4/plasma-workspace/default.nix | 63 - pkgs/desktops/plasma-5.4/polkit-kde-agent.nix | 31 - pkgs/desktops/plasma-5.4/powerdevil.nix | 20 - pkgs/desktops/plasma-5.4/setup-hook.sh | 1 - pkgs/desktops/plasma-5.4/srcs.nix | 301 --- pkgs/desktops/plasma-5.4/systemsettings.nix | 21 - .../libraries/kde-frameworks-5.15/attica.nix | 11 - .../libraries/kde-frameworks-5.15/baloo.nix | 25 - .../kde-frameworks-5.15/bluez-qt.nix | 17 - .../libraries/kde-frameworks-5.15/default.nix | 112 - .../0001-extra-cmake-modules-paths.patch | 74 - .../extra-cmake-modules/default.nix | 18 - .../extra-cmake-modules/setup-hook.sh | 27 - .../kde-frameworks-5.15/fetchsrcs.sh | 57 - .../frameworkintegration.nix | 17 - .../kde-frameworks-5.15/kactivities.nix | 22 - .../libraries/kde-frameworks-5.15/kapidox.nix | 12 - .../kde-frameworks-5.15/karchive.nix | 11 - .../kde-frameworks-5.15/kauth/default.nix | 16 - .../kauth/kauth-policy-install.patch | 13 - .../kde-frameworks-5.15/kbookmarks.nix | 25 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kde-frameworks-5.15/kcmutils/default.nix | 17 - .../libraries/kde-frameworks-5.15/kcodecs.nix | 11 - .../kde-frameworks-5.15/kcompletion.nix | 14 - .../libraries/kde-frameworks-5.15/kconfig.nix | 16 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kconfigwidgets/default.nix | 17 - .../kde-frameworks-5.15/kcoreaddons.nix | 13 - .../libraries/kde-frameworks-5.15/kcrash.nix | 16 - .../kde-frameworks-5.15/kdbusaddons.nix | 17 - .../kde-frameworks-5.15/kdeclarative.nix | 22 - .../libraries/kde-frameworks-5.15/kded.nix | 19 - .../kde-frameworks-5.15/kdelibs4support.nix | 32 - .../kde-frameworks-5.15/kdesignerplugin.nix | 31 - .../libraries/kde-frameworks-5.15/kdesu.nix | 13 - .../kde-frameworks-5.15/kdewebkit.nix | 13 - .../libraries/kde-frameworks-5.15/kdnssd.nix | 13 - .../kde-frameworks-5.15/kdoctools/default.nix | 20 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kdoctools/setup-hook.sh | 5 - .../kde-frameworks-5.15/kemoticons.nix | 17 - .../kde-frameworks-5.15/kfilemetadata.nix | 13 - .../kde-frameworks-5.15/kglobalaccel.nix | 23 - .../kde-frameworks-5.15/kguiaddons.nix | 13 - .../libraries/kde-frameworks-5.15/khtml.nix | 21 - .../libraries/kde-frameworks-5.15/ki18n.nix | 16 - .../kde-frameworks-5.15/kiconthemes.nix | 13 - .../kde-frameworks-5.15/kidletime.nix | 15 - .../kde-frameworks-5.15/kimageformats.nix | 13 - .../kinit/0001-kinit-libpath.patch | 42 - .../kde-frameworks-5.15/kinit/default.nix | 17 - .../libraries/kde-frameworks-5.15/kio.nix | 30 - .../kde-frameworks-5.15/kitemmodels.nix | 11 - .../kde-frameworks-5.15/kitemviews.nix | 11 - .../kde-frameworks-5.15/kjobwidgets.nix | 16 - .../libraries/kde-frameworks-5.15/kjs.nix | 16 - .../kde-frameworks-5.15/kjsembed.nix | 17 - .../kde-frameworks-5.15/kmediaplayer.nix | 15 - .../kde-frameworks-5.15/knewstuff.nix | 17 - .../kde-frameworks-5.15/knotifications.nix | 21 - .../kde-frameworks-5.15/knotifyconfig.nix | 13 - .../kpackage/0001-allow-external-paths.patch | 25 - .../0002-qdiriterator-follow-symlinks.patch | 39 - .../kde-frameworks-5.15/kpackage/default.nix | 26 - .../libraries/kde-frameworks-5.15/kparts.nix | 17 - .../libraries/kde-frameworks-5.15/kpeople.nix | 15 - .../kde-frameworks-5.15/kplotting.nix | 11 - .../libraries/kde-frameworks-5.15/kpty.nix | 10 - .../libraries/kde-frameworks-5.15/kross.nix | 14 - .../libraries/kde-frameworks-5.15/krunner.nix | 16 - .../0001-qdiriterator-follow-symlinks.patch | 25 - .../kservice/0002-no-canonicalize-path.patch | 25 - .../kde-frameworks-5.15/kservice/default.nix | 19 - .../kservice/setup-hook.sh | 43 - .../0001-no-qcoreapplication.patch | 48 - .../ktexteditor/default.nix | 18 - .../kde-frameworks-5.15/ktextwidgets.nix | 16 - .../kde-frameworks-5.15/kunitconversion.nix | 10 - .../libraries/kde-frameworks-5.15/kwallet.nix | 21 - .../kde-frameworks-5.15/kwidgetsaddons.nix | 11 - .../kde-frameworks-5.15/kwindowsystem.nix | 13 - .../libraries/kde-frameworks-5.15/kxmlgui.nix | 17 - .../kde-frameworks-5.15/kxmlrpcclient.nix | 10 - .../kde-frameworks-5.15/modemmanager-qt.nix | 13 - .../kde-frameworks-5.15/networkmanager-qt.nix | 13 - .../plasma-framework/default.nix | 25 - .../libraries/kde-frameworks-5.15/solid.nix | 17 - .../libraries/kde-frameworks-5.15/sonnet.nix | 13 - .../libraries/kde-frameworks-5.15/srcs.nix | 549 ----- .../kde-frameworks-5.15/threadweaver.nix | 11 - pkgs/top-level/all-packages.nix | 14 +- 163 files changed, 7 insertions(+), 7621 deletions(-) delete mode 100644 pkgs/applications/kde-apps-15.08/ark.nix delete mode 100644 pkgs/applications/kde-apps-15.08/baloo-widgets.nix delete mode 100644 pkgs/applications/kde-apps-15.08/default.nix delete mode 100644 pkgs/applications/kde-apps-15.08/dolphin-plugins.nix delete mode 100644 pkgs/applications/kde-apps-15.08/dolphin.nix delete mode 100755 pkgs/applications/kde-apps-15.08/fetchsrcs.sh delete mode 100644 pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix delete mode 100644 pkgs/applications/kde-apps-15.08/gpgmepp.nix delete mode 100644 pkgs/applications/kde-apps-15.08/gwenview.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kate.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kde-app.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kde-locale-4.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kde-locale-5.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/default.nix delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch delete mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh delete mode 100644 pkgs/applications/kde-apps-15.08/kgpg.nix delete mode 100644 pkgs/applications/kde-apps-15.08/konsole.nix delete mode 100644 pkgs/applications/kde-apps-15.08/ksnapshot.nix delete mode 100644 pkgs/applications/kde-apps-15.08/l10n.nix delete mode 100644 pkgs/applications/kde-apps-15.08/libkdcraw.nix delete mode 100644 pkgs/applications/kde-apps-15.08/libkexiv2.nix delete mode 100644 pkgs/applications/kde-apps-15.08/libkipi.nix delete mode 100644 pkgs/applications/kde-apps-15.08/okular.nix delete mode 100644 pkgs/applications/kde-apps-15.08/oxygen-icons.nix delete mode 100644 pkgs/applications/kde-apps-15.08/print-manager.nix delete mode 100644 pkgs/applications/kde-apps-15.08/srcs.nix delete mode 100644 pkgs/desktops/plasma-5.4/bluedevil.nix delete mode 100644 pkgs/desktops/plasma-5.4/breeze-qt4.nix delete mode 100644 pkgs/desktops/plasma-5.4/breeze-qt5.nix delete mode 100644 pkgs/desktops/plasma-5.4/default.nix delete mode 100755 pkgs/desktops/plasma-5.4/fetchsrcs.sh delete mode 100644 pkgs/desktops/plasma-5.4/kde-cli-tools.nix delete mode 100644 pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/kdecoration.nix delete mode 100644 pkgs/desktops/plasma-5.4/kdeplasma-addons.nix delete mode 100644 pkgs/desktops/plasma-5.4/kgamma5.nix delete mode 100644 pkgs/desktops/plasma-5.4/khelpcenter.nix delete mode 100644 pkgs/desktops/plasma-5.4/khotkeys.nix delete mode 100644 pkgs/desktops/plasma-5.4/kinfocenter.nix delete mode 100644 pkgs/desktops/plasma-5.4/kmenuedit.nix delete mode 100644 pkgs/desktops/plasma-5.4/kscreen.nix delete mode 100644 pkgs/desktops/plasma-5.4/ksshaskpass.nix delete mode 100644 pkgs/desktops/plasma-5.4/ksysguard.nix delete mode 100644 pkgs/desktops/plasma-5.4/kwayland.nix delete mode 100644 pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5.4/kwin/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/kwrited.nix delete mode 100644 pkgs/desktops/plasma-5.4/libkscreen/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch delete mode 100644 pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5.4/libksysguard/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/milou.nix delete mode 100644 pkgs/desktops/plasma-5.4/oxygen-fonts.nix delete mode 100644 pkgs/desktops/plasma-5.4/oxygen.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-mediacenter.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-nm/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-pa.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix delete mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch delete mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/default.nix delete mode 100644 pkgs/desktops/plasma-5.4/polkit-kde-agent.nix delete mode 100644 pkgs/desktops/plasma-5.4/powerdevil.nix delete mode 100644 pkgs/desktops/plasma-5.4/setup-hook.sh delete mode 100644 pkgs/desktops/plasma-5.4/srcs.nix delete mode 100644 pkgs/desktops/plasma-5.4/systemsettings.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/attica.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/baloo.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh delete mode 100755 pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/karchive.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kded.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/khtml.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kio.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kjs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kparts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kpty.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kross.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/krunner.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/solid.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/srcs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix deleted file mode 100644 index 36a1ca7cfbd..00000000000 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, karchive -, kconfig -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, khtml -, kio -, kservice -, kpty -, kwidgetsaddons -, libarchive -, p7zip -, unrar -, unzipNLS -, zip -}: - -let PATH = lib.makeSearchPath "bin" [ - p7zip unrar unzipNLS zip - ]; -in - -kdeApp { - name = "ark"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - karchive - kconfig - kcrash - kdbusaddons - kiconthemes - kservice - kpty - kwidgetsaddons - libarchive - ]; - propagatedBuildInputs = [ - khtml - ki18n - kio - ]; - postInstall = '' - wrapQtProgram "$out/bin/ark" \ - --prefix PATH : "${PATH}" - ''; - meta = { - license = with lib.licenses; [ gpl2 lgpl3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix deleted file mode 100644 index a24928160df..00000000000 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, kconfig -, kio -, ki18n -, kservice -, kfilemetadata -, baloo -, kdelibs4support -}: - -kdeApp { - name = "baloo-widgets"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kservice - ]; - propagatedBuildInputs = [ - baloo - kdelibs4support - kfilemetadata - ki18n - kio - ]; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix deleted file mode 100644 index 8694ee0b264..00000000000 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib stdenv; - - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - mirror = "mirror://kde"; - - kdeApp = import ./kde-app.nix { - inherit stdenv lib; - inherit debug srcs; - }; - - packages = self: with self; { - kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; - - ark = callPackage ./ark.nix {}; - baloo-widgets = callPackage ./baloo-widgets.nix {}; - dolphin = callPackage ./dolphin.nix {}; - dolphin-plugins = callPackage ./dolphin-plugins.nix {}; - ffmpegthumbs = callPackage ./ffmpegthumbs.nix {}; - gpgmepp = callPackage ./gpgmepp.nix {}; - gwenview = callPackage ./gwenview.nix {}; - kate = callPackage ./kate.nix {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; - kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; }; - konsole = callPackage ./konsole.nix {}; - ksnapshot = callPackage ./ksnapshot.nix {}; - libkdcraw = callPackage ./libkdcraw.nix {}; - libkexiv2 = callPackage ./libkexiv2.nix {}; - libkipi = callPackage ./libkipi.nix {}; - okular = callPackage ./okular.nix {}; - oxygen-icons = callPackage ./oxygen-icons.nix {}; - print-manager = callPackage ./print-manager.nix {}; - - l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); - }; - - newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope); - -in lib.makeScope newScope packages diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix deleted file mode 100644 index 72a08c73261..00000000000 --- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, kxmlgui -, ki18n -, kio -, kdelibs4support -, dolphin -}: - -kdeApp { - name = "dolphin-plugins"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kxmlgui - dolphin - ]; - propagatedBuildInputs = [ - kdelibs4support - ki18n - kio - ]; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix deleted file mode 100644 index 3218146f510..00000000000 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, kinit -, kcmutils -, kcoreaddons -, knewstuff -, ki18n -, kdbusaddons -, kbookmarks -, kconfig -, kio -, kparts -, solid -, kiconthemes -, kcompletion -, ktexteditor -, kwindowsystem -, knotifications -, kactivities -, phonon -, baloo -, baloo-widgets -, kfilemetadata -, kdelibs4support -}: - -kdeApp { - name = "dolphin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kinit - kcmutils - kcoreaddons - knewstuff - kdbusaddons - kbookmarks - kconfig - kparts - solid - kiconthemes - kcompletion - knotifications - phonon - baloo-widgets - ]; - propagatedBuildInputs = [ - baloo - kactivities - kdelibs4support - kfilemetadata - ki18n - kio - ktexteditor - kwindowsystem - ]; - postInstall = '' - wrapQtProgram "$out/bin/dolphin" - ''; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh deleted file mode 100755 index 126753e3ccc..00000000000 --- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh +++ /dev/null @@ -1,56 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/stable/applications/15.08.3/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <>../srcs.nix <>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix b/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix deleted file mode 100644 index 64f7961e7c7..00000000000 --- a/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, ffmpeg -}: - -kdeApp { - name = "ffmpegthumbs"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - ffmpeg - ]; - meta = { - license = with lib.licenses; [ gpl2 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/gpgmepp.nix b/pkgs/applications/kde-apps-15.08/gpgmepp.nix deleted file mode 100644 index ac14573dcaa..00000000000 --- a/pkgs/applications/kde-apps-15.08/gpgmepp.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, boost -, gpgme -}: - -kdeApp { - name = "gpgmepp"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - boost - gpgme - ]; - meta = { - license = with lib.licenses; [ lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix deleted file mode 100644 index 732ac11e96d..00000000000 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, baloo -, exiv2 -, kactivities -, kdelibs4support -, kio -, lcms2 -, phonon -, qtsvg -, qtx11extras -}: - -kdeApp { - name = "gwenview"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - exiv2 - lcms2 - phonon - qtsvg - ]; - propagatedBuildInputs = [ - baloo - kactivities - kdelibs4support - kio - qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/gwenview" - ''; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix deleted file mode 100644 index 91eeb2314a4..00000000000 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, qtscript -, kactivities -, kconfig -, kcrash -, kguiaddons -, kiconthemes -, ki18n -, kinit -, kjobwidgets -, kio -, kparts -, ktexteditor -, kwindowsystem -, kxmlgui -, kdbusaddons -, kwallet -, plasma-framework -, kitemmodels -, knotifications -, threadweaver -, knewstuff -, libgit2 -}: - -kdeApp { - name = "kate"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtscript - kconfig - kcrash - kguiaddons - kiconthemes - kinit - kjobwidgets - kparts - kxmlgui - kdbusaddons - kwallet - kitemmodels - knotifications - threadweaver - knewstuff - libgit2 - ]; - propagatedBuildInputs = [ - kactivities - ki18n - kio - ktexteditor - kwindowsystem - plasma-framework - ]; - postInstall = '' - wrapQtProgram "$out/bin/kate" - wrapQtProgram "$out/bin/kwrite" - ''; - meta = { - license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/kde-app.nix b/pkgs/applications/kde-apps-15.08/kde-app.nix deleted file mode 100644 index 242f3d9c793..00000000000 --- a/pkgs/applications/kde-apps-15.08/kde-app.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, debug, srcs }: - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); -}) diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-4.nix b/pkgs/applications/kde-apps-15.08/kde-locale-4.nix deleted file mode 100644 index 4b612ee3e3c..00000000000 --- a/pkgs/applications/kde-apps-15.08/kde-locale-4.nix +++ /dev/null @@ -1,20 +0,0 @@ -name: args: - -{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }: - -kdeApp (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt4"; - - nativeBuildInputs = - [ automoc4 cmake gettext perl ] - ++ (args.nativeBuildInputs or []); - buildInputs = - [ kdelibs ] - ++ (args.buildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; -}) diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-5.nix b/pkgs/applications/kde-apps-15.08/kde-locale-5.nix deleted file mode 100644 index 522fc542aeb..00000000000 --- a/pkgs/applications/kde-apps-15.08/kde-locale-5.nix +++ /dev/null @@ -1,17 +0,0 @@ -name: args: - -{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: - -kdeApp (args // { - sname = "kde-l10n-${name}"; - name = "kde-l10n-${name}-qt5"; - - nativeBuildInputs = - [ cmake extra-cmake-modules gettext kdoctools ] - ++ (args.nativeBuildInputs or []); - - preConfigure = '' - sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt - ${args.preConfigure or ""} - ''; -}) diff --git a/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix b/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix deleted file mode 100644 index 027b8248c5c..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, libkexiv2 -, libkdcraw -}: - -kdeApp { - name = "kdegraphics-thumbnailers"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - libkexiv2 - libkdcraw - ]; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch deleted file mode 100644 index b7d7300e9a8..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:54:57 -0500 -Subject: [PATCH 1/2] old kde4 cmake policies - ---- - cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake -index 7d54b9b..c435571 100644 ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -345,6 +345,39 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below -+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) -+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) -+cmake_policy(VERSION 2.4.5) -+ -+# CMake 2.6, set compatibility behaviour to cmake 2.4 -+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above -+# resets the policy settings, so we get a lot of warnings -+ -+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough -+cmake_policy(SET CMP0000 OLD) -+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests -+cmake_policy(SET CMP0002 OLD) -+# CMP0003: add the link paths to the link command as with cmake 2.4 -+cmake_policy(SET CMP0003 OLD) -+# CMP0005: keep escaping behaviour for definitions added via add_definitions() -+cmake_policy(SET CMP0005 OLD) -+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file -+# where this is done, macros and functions are executed with the policies as they -+# were when the were defined. Keep the OLD behaviour so we can set the policies here -+# for all KDE software without the big warning -+cmake_policy(SET CMP0011 OLD) -+ -+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files -+# in this directory over those from CMAKE_MODULE_PATH -+cmake_policy(SET CMP0017 NEW) -+ -+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake -+if (POLICY CMP0026) -+ cmake_policy(SET CMP0026 OLD) -+endif (POLICY CMP0026) -+ -+ - # Only do something if it hasn't been found yet - if(NOT KDE4_FOUND) - --- -2.5.0 - diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch deleted file mode 100644 index ff0306ea148..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 7 Sep 2015 13:56:03 -0500 -Subject: [PATCH 2/2] polkit install path - ---- - kdecore/auth/ConfigureChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake -index 7cf9cb5..c8334ae 100644 ---- a/kdecore/auth/ConfigureChecks.cmake -+++ b/kdecore/auth/ConfigureChecks.cmake -@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) --- -2.5.0 - diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch deleted file mode 100644 index a79d7b2b7d1..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp -index ab8f76d..2ae5089 100644 ---- a/kdecore/kernel/kstandarddirs.cpp -+++ b/kdecore/kernel/kstandarddirs.cpp -@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults() - else - { - xdgdirList.clear(); -- xdgdirList.append(QString::fromLatin1("/etc/xdg")); --#ifdef Q_WS_WIN -- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); --#else -- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); --#endif - } - - QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); -@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults() - } - } else { - xdgdirList = kdedirDataDirs; --#ifndef Q_WS_WIN -- xdgdirList.append(QString::fromLatin1("/usr/local/share/")); -- xdgdirList.append(QString::fromLatin1("/usr/share/")); --#endif - } - - localXdgDir = readEnvPath("XDG_DATA_HOME"); -diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp -index 4c9cad9..6849d45 100644 ---- a/solid/solid/xdgbasedirs.cpp -+++ b/solid/solid/xdgbasedirs.cpp -@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource ) - { - if ( qstrncmp( "data", resource, 4 ) == 0 ) { - if ( instance()->mDataDirs.isEmpty() ) { -- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" ); -+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" ); - } - return instance()->mDataDirs; - } else if ( qstrncmp( "config", resource, 6 ) == 0 ) { - if ( instance()->mConfigDirs.isEmpty() ) { -- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" ); -+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" ); - } - return instance()->mConfigDirs; - } diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix deleted file mode 100644 index a30b19774f2..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ kdeApp, attica, attr, automoc4, avahi, bison, cmake -, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase -, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig -, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info -, soprano, strigi, udev, xz -, lib -}: - -kdeApp { - name = "kdelibs"; - - buildInputs = [ - attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 - polkit_qt4 qca2 shared_desktop_ontologies udev xz - ]; - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - nativeBuildInputs = [ - automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info - ]; - - patches = [ - ./0001-old-kde4-cmake-policies.patch - ./0002-polkit-install-path.patch - ./0003-remove_xdg_impurities.patch - ]; - - # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DWITH_SOLID_UDISKS2=ON" - "-DKDE_DEFAULT_HOME=.kde" - ]; - - setupHook = ./setup-hook.sh; - - meta = { - licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch deleted file mode 100644 index d2ecac663ec..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh b/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh deleted file mode 100644 index e0a75dc8acd..00000000000 --- a/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -addQt4Plugins() { - if [[ -d "$1/lib/qt4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi - - if [[ -d "$1/lib/kde4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi -} -envHooks+=(addQt4Plugins) diff --git a/pkgs/applications/kde-apps-15.08/kgpg.nix b/pkgs/applications/kde-apps-15.08/kgpg.nix deleted file mode 100644 index 3ee92519718..00000000000 --- a/pkgs/applications/kde-apps-15.08/kgpg.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, makeWrapper -, perl -, pkgconfig -, boost -, gpgme -, kdelibs -, kdepimlibs -, gnupg -}: - -kdeApp { - name = "kgpg"; - nativeBuildInputs = [ - automoc4 - cmake - makeWrapper - perl - pkgconfig - ]; - buildInputs = [ - boost - gpgme - kdelibs - kdepimlibs - ]; - postInstall = '' - wrapProgram "$out/bin/kgpg" \ - --prefix PATH : "${gnupg}/bin" - ''; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix deleted file mode 100644 index 4b4cba2a377..00000000000 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, qtscript -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kguiaddons -, ki18n -, kiconthemes -, kinit -, kdelibs4support -, kio -, knotifications -, knotifyconfig -, kparts -, kpty -, kservice -, ktextwidgets -, kwidgetsaddons -, kwindowsystem -, kxmlgui -}: - -kdeApp { - name = "konsole"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - qtscript - kbookmarks - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kguiaddons - kiconthemes - kinit - kio - knotifications - knotifyconfig - kparts - kpty - kservice - ktextwidgets - kwidgetsaddons - kxmlgui - ]; - propagatedBuildInputs = [ - kdelibs4support - ki18n - kwindowsystem - ]; - postInstall = '' - wrapQtProgram "$out/bin/konsole" - ''; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/ksnapshot.nix b/pkgs/applications/kde-apps-15.08/ksnapshot.nix deleted file mode 100644 index b757f4f0403..00000000000 --- a/pkgs/applications/kde-apps-15.08/ksnapshot.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, libkipi -, libXfixes -}: - -kdeApp { - name = "ksnapshot"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - libkipi - libXfixes - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/l10n.nix b/pkgs/applications/kde-apps-15.08/l10n.nix deleted file mode 100644 index 7a9f1c36cbf..00000000000 --- a/pkgs/applications/kde-apps-15.08/l10n.nix +++ /dev/null @@ -1,231 +0,0 @@ -{ callPackage, pkgs, lib }: - -let - - kdeLocale4 = import ./kde-locale-4.nix; - kdeLocale5 = import ./kde-locale-5.nix; - -in - -lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { - ar = { - qt4 = callPackage (kdeLocale4 "ar" {}) {}; - qt5 = callPackage (kdeLocale5 "ar" {}) {}; - }; - bg = { - qt4 = callPackage (kdeLocale4 "bg" {}) {}; - qt5 = callPackage (kdeLocale5 "bg" {}) {}; - }; - bs = { - qt4 = callPackage (kdeLocale4 "bs" {}) {}; - qt5 = callPackage (kdeLocale5 "bs" {}) {}; - }; - ca = { - qt4 = callPackage (kdeLocale4 "ca" {}) {}; - qt5 = callPackage (kdeLocale5 "ca" {}) {}; - }; - ca_valencia = { - qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {}; - qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {}; - }; - cs = { - qt4 = callPackage (kdeLocale4 "cs" {}) {}; - qt5 = callPackage (kdeLocale5 "cs" {}) {}; - }; - da = { - qt4 = callPackage (kdeLocale4 "da" {}) {}; - qt5 = callPackage (kdeLocale5 "da" {}) {}; - }; - de = { - qt4 = callPackage (kdeLocale4 "de" {}) {}; - qt5 = callPackage (kdeLocale5 "de" {}) {}; - }; - el = { - qt4 = callPackage (kdeLocale4 "el" {}) {}; - qt5 = callPackage (kdeLocale5 "el" {}) {}; - }; - en_GB = { - qt4 = callPackage (kdeLocale4 "en_GB" {}) {}; - qt5 = callPackage (kdeLocale5 "en_GB" {}) {}; - }; - eo = { - qt4 = callPackage (kdeLocale4 "eo" {}) {}; - qt5 = callPackage (kdeLocale5 "eo" {}) {}; - }; - es = { - qt4 = callPackage (kdeLocale4 "es" {}) {}; - qt5 = callPackage (kdeLocale5 "es" {}) {}; - }; - et = { - qt4 = callPackage (kdeLocale4 "et" {}) {}; - qt5 = callPackage (kdeLocale5 "et" {}) {}; - }; - eu = { - qt4 = callPackage (kdeLocale4 "eu" {}) {}; - qt5 = callPackage (kdeLocale5 "eu" {}) {}; - }; - fa = { - qt4 = callPackage (kdeLocale4 "fa" {}) {}; - qt5 = callPackage (kdeLocale5 "fa" {}) {}; - }; - fi = { - qt4 = callPackage (kdeLocale4 "fi" {}) {}; - qt5 = callPackage (kdeLocale5 "fi" {}) {}; - }; - fr = { - qt4 = callPackage (kdeLocale4 "fr" {}) {}; - qt5 = callPackage (kdeLocale5 "fr" {}) {}; - }; - ga = { - qt4 = callPackage (kdeLocale4 "ga" {}) {}; - qt5 = callPackage (kdeLocale5 "ga" {}) {}; - }; - gl = { - qt4 = callPackage (kdeLocale4 "gl" {}) {}; - qt5 = callPackage (kdeLocale5 "gl" {}) {}; - }; - he = { - qt4 = callPackage (kdeLocale4 "he" {}) {}; - qt5 = callPackage (kdeLocale5 "he" {}) {}; - }; - hi = { - qt4 = callPackage (kdeLocale4 "hi" {}) {}; - qt5 = callPackage (kdeLocale5 "hi" {}) {}; - }; - hr = { - qt4 = callPackage (kdeLocale4 "hr" {}) {}; - qt5 = callPackage (kdeLocale5 "hr" {}) {}; - }; - hu = { - qt4 = callPackage (kdeLocale4 "hu" {}) {}; - qt5 = callPackage (kdeLocale5 "hu" {}) {}; - }; - ia = { - qt4 = callPackage (kdeLocale4 "ia" {}) {}; - qt5 = callPackage (kdeLocale5 "ia" {}) {}; - }; - id = { - qt4 = callPackage (kdeLocale4 "id" {}) {}; - qt5 = callPackage (kdeLocale5 "id" {}) {}; - }; - is = { - qt4 = callPackage (kdeLocale4 "is" {}) {}; - qt5 = callPackage (kdeLocale5 "is" {}) {}; - }; - it = { - qt4 = callPackage (kdeLocale4 "it" {}) {}; - qt5 = callPackage (kdeLocale5 "it" {}) {}; - }; - ja = { - qt4 = callPackage (kdeLocale4 "ja" {}) {}; - qt5 = callPackage (kdeLocale5 "ja" {}) {}; - }; - kk = { - qt4 = callPackage (kdeLocale4 "kk" {}) {}; - qt5 = callPackage (kdeLocale5 "kk" {}) {}; - }; - km = { - qt4 = callPackage (kdeLocale4 "km" {}) {}; - qt5 = callPackage (kdeLocale5 "km" {}) {}; - }; - ko = { - qt4 = callPackage (kdeLocale4 "ko" {}) {}; - qt5 = callPackage (kdeLocale5 "ko" {}) {}; - }; - lt = { - qt4 = callPackage (kdeLocale4 "lt" {}) {}; - qt5 = callPackage (kdeLocale5 "lt" {}) {}; - }; - lv = { - qt4 = callPackage (kdeLocale4 "lv" {}) {}; - qt5 = callPackage (kdeLocale5 "lv" {}) {}; - }; - mr = { - qt4 = callPackage (kdeLocale4 "mr" {}) {}; - qt5 = callPackage (kdeLocale5 "mr" {}) {}; - }; - nb = { - qt4 = callPackage (kdeLocale4 "nb" {}) {}; - qt5 = callPackage (kdeLocale5 "nb" {}) {}; - }; - nds = { - qt4 = callPackage (kdeLocale4 "nds" {}) {}; - qt5 = callPackage (kdeLocale5 "nds" {}) {}; - }; - nl = { - qt4 = callPackage (kdeLocale4 "nl" {}) {}; - qt5 = callPackage (kdeLocale5 "nl" {}) {}; - }; - nn = { - qt4 = callPackage (kdeLocale4 "nn" {}) {}; - qt5 = callPackage (kdeLocale5 "nn" {}) {}; - }; - pa = { - qt4 = callPackage (kdeLocale4 "pa" {}) {}; - qt5 = callPackage (kdeLocale5 "pa" {}) {}; - }; - pl = { - qt4 = callPackage (kdeLocale4 "pl" {}) {}; - qt5 = callPackage (kdeLocale5 "pl" {}) {}; - }; - pt = { - qt4 = callPackage (kdeLocale4 "pt" {}) {}; - qt5 = callPackage (kdeLocale5 "pt" {}) {}; - }; - pt_BR = { - qt4 = callPackage (kdeLocale4 "pt_BR" {}) {}; - qt5 = callPackage (kdeLocale5 "pt_BR" {}) {}; - }; - ro = { - qt4 = callPackage (kdeLocale4 "ro" {}) {}; - qt5 = callPackage (kdeLocale5 "ro" {}) {}; - }; - ru = { - qt4 = callPackage (kdeLocale4 "ru" {}) {}; - qt5 = callPackage (kdeLocale5 "ru" {}) {}; - }; - sk = { - qt4 = callPackage (kdeLocale4 "sk" {}) {}; - qt5 = callPackage (kdeLocale5 "sk" {}) {}; - }; - sl = { - qt4 = callPackage (kdeLocale4 "sl" {}) {}; - qt5 = callPackage (kdeLocale5 "sl" {}) {}; - }; - sr = { - qt4 = callPackage (kdeLocale4 "sr" {}) {}; - qt5 = callPackage (kdeLocale5 "sr" { - preConfigure = '' - sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt - ''; - }) {}; - }; - sv = { - qt4 = callPackage (kdeLocale4 "sv" {}) {}; - qt5 = callPackage (kdeLocale5 "sv" {}) {}; - }; - tr = { - qt4 = callPackage (kdeLocale4 "tr" {}) {}; - qt5 = callPackage (kdeLocale5 "tr" {}) {}; - }; - ug = { - qt4 = callPackage (kdeLocale4 "ug" {}) {}; - qt5 = callPackage (kdeLocale5 "ug" {}) {}; - }; - uk = { - qt4 = callPackage (kdeLocale4 "uk" {}) {}; - qt5 = callPackage (kdeLocale5 "uk" {}) {}; - }; - wa = { - qt4 = callPackage (kdeLocale4 "wa" {}) {}; - qt5 = callPackage (kdeLocale5 "wa" {}) {}; - }; - zh_CN = { - qt4 = callPackage (kdeLocale4 "zh_CN" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_CN" {}) {}; - }; - zh_TW = { - qt4 = callPackage (kdeLocale4 "zh_TW" {}) {}; - qt5 = callPackage (kdeLocale5 "zh_TW" {}) {}; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/libkdcraw.nix b/pkgs/applications/kde-apps-15.08/libkdcraw.nix deleted file mode 100644 index 8b19e9f90c6..00000000000 --- a/pkgs/applications/kde-apps-15.08/libkdcraw.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, libraw -, kdelibs -}: - -kdeApp { - name = "libkdcraw"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - libraw - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/libkexiv2.nix b/pkgs/applications/kde-apps-15.08/libkexiv2.nix deleted file mode 100644 index 8ed84236955..00000000000 --- a/pkgs/applications/kde-apps-15.08/libkexiv2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, exiv2 -, kdelibs -}: - -kdeApp { - name = "libkexiv2"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - exiv2 - kdelibs - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/libkipi.nix b/pkgs/applications/kde-apps-15.08/libkipi.nix deleted file mode 100644 index a9053b467f9..00000000000 --- a/pkgs/applications/kde-apps-15.08/libkipi.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -}: - -kdeApp { - name = "libkipi"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/okular.nix b/pkgs/applications/kde-apps-15.08/okular.nix deleted file mode 100644 index 0691325d7a5..00000000000 --- a/pkgs/applications/kde-apps-15.08/okular.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qimageblitz -, poppler_qt4 -, libspectre -, libkexiv2 -, djvulibre -, libtiff -, freetype -, ebook_tools -}: - -kdeApp { - name = "okular"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - buildInputs = [ - kdelibs - qimageblitz - poppler_qt4 - libspectre - libkexiv2 - djvulibre - libtiff - freetype - ebook_tools - ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix deleted file mode 100644 index 4f9a92dffdd..00000000000 --- a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeApp -, lib -, cmake -}: - -kdeApp { - name = "oxygen-icons"; - nativeBuildInputs = [ cmake ]; - meta = { - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix deleted file mode 100644 index b4eab372789..00000000000 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ kdeApp -, lib -, extra-cmake-modules -, qtdeclarative -, cups -, kconfig -, kconfigwidgets -, kdbusaddons -, kiconthemes -, ki18n -, kcmutils -, kio -, knotifications -, plasma-framework -, kwidgetsaddons -, kwindowsystem -, kitemviews -}: - -kdeApp { - name = "print-manager"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - cups - kconfig - kconfigwidgets - kdbusaddons - kiconthemes - kcmutils - knotifications - kwidgetsaddons - kitemviews - ]; - propagatedBuildInputs = [ - ki18n - kio - kwindowsystem - plasma-framework - qtdeclarative - ]; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix deleted file mode 100644 index d0187495729..00000000000 --- a/pkgs/applications/kde-apps-15.08/srcs.nix +++ /dev/null @@ -1,1981 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - akonadi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/akonadi-15.08.3.tar.xz"; - sha256 = "0v7zwvixfpf5fskxlamvmyaagb2vxqkw81fzsb4yiyq8493lm0mf"; - name = "akonadi-15.08.3.tar.xz"; - }; - }; - akonadi-calendar = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/akonadi-calendar-15.08.3.tar.xz"; - sha256 = "11mp32k71pa9f6gkqmm1dkia1ljcr9wdx4iyb9ys8fm580xxk5gv"; - name = "akonadi-calendar-15.08.3.tar.xz"; - }; - }; - akonadi-search = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/akonadi-search-15.08.3.tar.xz"; - sha256 = "10iwmb76yijqpagvsjgwyksq1j3j61ihv2hmi09z44zz4w171vzb"; - name = "akonadi-search-15.08.3.tar.xz"; - }; - }; - amor = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/amor-15.08.3.tar.xz"; - sha256 = "0jci7yvxc1z7kcs1sw85dvsvz2c2ak2szxlf5bz09msgpxgb0xxc"; - name = "amor-15.08.3.tar.xz"; - }; - }; - analitza = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/analitza-15.08.3.tar.xz"; - sha256 = "174s4qd0j6yx4r8vn7ak598d5kiyhqzy2cc4l7iynpyqs28ybpwi"; - name = "analitza-15.08.3.tar.xz"; - }; - }; - ark = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ark-15.08.3.tar.xz"; - sha256 = "0w61ifdwhv6prnxryqsz4ka7508jj4w3zj4c2x34lv2g9q05fw21"; - name = "ark-15.08.3.tar.xz"; - }; - }; - artikulate = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/artikulate-15.08.3.tar.xz"; - sha256 = "0bsdjjr5zyl57iagxd1vb1g5zz1w6k85788pwp1rkvwwv7qmdcng"; - name = "artikulate-15.08.3.tar.xz"; - }; - }; - audiocd-kio = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/audiocd-kio-15.08.3.tar.xz"; - sha256 = "09v5a6r8ks5zaxd1p35wqngnaprfww0wvzkjlxs0j2wf7v4in0kb"; - name = "audiocd-kio-15.08.3.tar.xz"; - }; - }; - baloo-widgets = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/baloo-widgets-15.08.3.tar.xz"; - sha256 = "0lavpqv798cfnfpdxn7ypwh77550kky2ar7l3nsi5jczkk2n0kza"; - name = "baloo-widgets-15.08.3.tar.xz"; - }; - }; - blinken = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/blinken-15.08.3.tar.xz"; - sha256 = "00r2yjvj3g1lj0lzvwf0xjgras8fmqllgdy5d8ij5ihg7bb9l3rq"; - name = "blinken-15.08.3.tar.xz"; - }; - }; - bomber = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/bomber-15.08.3.tar.xz"; - sha256 = "084prrbpc5wscbh4w04r4452fs7zkklmfc1mga1ba2wp1fpf24yc"; - name = "bomber-15.08.3.tar.xz"; - }; - }; - bovo = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/bovo-15.08.3.tar.xz"; - sha256 = "0fzwp9n0fn16z3r60ry9zn1acs76dyzrkrl45jv927zk4x7pk5vi"; - name = "bovo-15.08.3.tar.xz"; - }; - }; - cantor = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/cantor-15.08.3.tar.xz"; - sha256 = "0fyy7wda6cd1vnw8whnadfa4hlw5yjw3npv0wdnxql426ig33dd1"; - name = "cantor-15.08.3.tar.xz"; - }; - }; - cervisia = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/cervisia-15.08.3.tar.xz"; - sha256 = "083cw5yh63lkkgv68hynnkx9b8y9myz5h92vbh17vrza07w94zmi"; - name = "cervisia-15.08.3.tar.xz"; - }; - }; - dolphin = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/dolphin-15.08.3.tar.xz"; - sha256 = "188a7yhk93rw8hhab852357jgygji5g45irs063hg47k1kms5vgm"; - name = "dolphin-15.08.3.tar.xz"; - }; - }; - dolphin-plugins = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/dolphin-plugins-15.08.3.tar.xz"; - sha256 = "1jgq418p72g804kkw10n3rawdky750fpq3wbwbdckxwjybanqd7y"; - name = "dolphin-plugins-15.08.3.tar.xz"; - }; - }; - dragon = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/dragon-15.08.3.tar.xz"; - sha256 = "0agncn4c0dbrrnz1rjmnrz9hxlqpavb9nb6zxzcyn30ssmy553qg"; - name = "dragon-15.08.3.tar.xz"; - }; - }; - ffmpegthumbs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ffmpegthumbs-15.08.3.tar.xz"; - sha256 = "15sbfhirys5qj25ns768agq2nanr6q1zyvmm4mbjqasl5rckxkmk"; - name = "ffmpegthumbs-15.08.3.tar.xz"; - }; - }; - filelight = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/filelight-15.08.3.tar.xz"; - sha256 = "0l6bvpxybcf1y2w12q8c9ixa5hgvs6sxa99hmyjxybj2icylr322"; - name = "filelight-15.08.3.tar.xz"; - }; - }; - gpgmepp = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/gpgmepp-15.08.3.tar.xz"; - sha256 = "03nl1zs9lsba0a9ba4qi5kn7l76g3135g7lbf9vfm9pvgl38bdfs"; - name = "gpgmepp-15.08.3.tar.xz"; - }; - }; - granatier = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/granatier-15.08.3.tar.xz"; - sha256 = "1k0pvvygzw5mzakpnrlwqc4rrdqkdbk5y5bw2r44m4594r5vkyfg"; - name = "granatier-15.08.3.tar.xz"; - }; - }; - gwenview = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/gwenview-15.08.3.tar.xz"; - sha256 = "1fdwh2ksivvliz46hzmha36kx1308ixz7zbmxiwfl0z4g49x28k6"; - name = "gwenview-15.08.3.tar.xz"; - }; - }; - jovie = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/jovie-15.08.3.tar.xz"; - sha256 = "1cxkgxkzj8g75jwbfzfc09fb9y3100yk56951vihifgbhilclh5r"; - name = "jovie-15.08.3.tar.xz"; - }; - }; - kaccessible = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kaccessible-15.08.3.tar.xz"; - sha256 = "16a9jvziq4xlc88ypd7qaqnx4dz5cr61l5gqkl3fhlrfc98aqnsm"; - name = "kaccessible-15.08.3.tar.xz"; - }; - }; - kaccounts-integration = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kaccounts-integration-15.08.3.tar.xz"; - sha256 = "146z5lgfy5gpwmyl7gx0qzv3za84g34rq5fqfj8xkw2ww65ncwgs"; - name = "kaccounts-integration-15.08.3.tar.xz"; - }; - }; - kaccounts-providers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kaccounts-providers-15.08.3.tar.xz"; - sha256 = "1nmdfb630k6bs0qzmzl1cl6xsz60nsk6w5kz5qildwgk6ll36dgx"; - name = "kaccounts-providers-15.08.3.tar.xz"; - }; - }; - kajongg = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kajongg-15.08.3.tar.xz"; - sha256 = "1xxqxwri5havnmdncqqpi8q0r69mnkf9qbpjzggxq4ciqc99hg8k"; - name = "kajongg-15.08.3.tar.xz"; - }; - }; - kalarmcal = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kalarmcal-15.08.3.tar.xz"; - sha256 = "0vaz3b8wp02qbx4xjj5wqx9vsy7jibhiwr60gl8nimjnyczxnr01"; - name = "kalarmcal-15.08.3.tar.xz"; - }; - }; - kalgebra = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kalgebra-15.08.3.tar.xz"; - sha256 = "1p1zq9lfwakawgnv99n17qxj7bx390pglk6v3j56l2p3zlsqjil1"; - name = "kalgebra-15.08.3.tar.xz"; - }; - }; - kalzium = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kalzium-15.08.3.tar.xz"; - sha256 = "0bz8qv0nmf7ysh47zmwhvwwi7vnb3kd190ci1sg7xdm342xdzdi1"; - name = "kalzium-15.08.3.tar.xz"; - }; - }; - kamera = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kamera-15.08.3.tar.xz"; - sha256 = "1jlywxbsa52rqlzm0lmq2xbz18r56s0jgwylmwja5rjcm0wp58hz"; - name = "kamera-15.08.3.tar.xz"; - }; - }; - kanagram = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kanagram-15.08.3.tar.xz"; - sha256 = "1nlz18ih95ppc7csqzbiix4my7xin8plf5wn55x7pp8jj6q44l2d"; - name = "kanagram-15.08.3.tar.xz"; - }; - }; - kapman = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kapman-15.08.3.tar.xz"; - sha256 = "1i125fkk9lj2azlhcvjxdli53lay0073f81n9vv3fkjyfkmdch2d"; - name = "kapman-15.08.3.tar.xz"; - }; - }; - kapptemplate = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kapptemplate-15.08.3.tar.xz"; - sha256 = "05hh09h58s4b32njf83viplmafbg4lw8zqp0qsyacdn37cid51a8"; - name = "kapptemplate-15.08.3.tar.xz"; - }; - }; - kate = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kate-15.08.3.tar.xz"; - sha256 = "0d31ph43d83mn806yfpj7w630r7rwsj0js6qp9738865il5c4428"; - name = "kate-15.08.3.tar.xz"; - }; - }; - katomic = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/katomic-15.08.3.tar.xz"; - sha256 = "144vchhis0ngg49h1znabx2kp02jfqyh04lq9sdndaawa729d2f6"; - name = "katomic-15.08.3.tar.xz"; - }; - }; - kblackbox = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kblackbox-15.08.3.tar.xz"; - sha256 = "16h4z8aagx8f161fyzzli0hdyqipsc9bl3pnicnkm9fcxlkrs1hj"; - name = "kblackbox-15.08.3.tar.xz"; - }; - }; - kblocks = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kblocks-15.08.3.tar.xz"; - sha256 = "025zharfv24vvvq0jy7kzmxkif4nix7ck40if5x0hxbkn902mmjf"; - name = "kblocks-15.08.3.tar.xz"; - }; - }; - kblog = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kblog-15.08.3.tar.xz"; - sha256 = "1bbkjg43dflqc3yxg96mphsmqzxrphp43m314cdrpka5pb39kdc9"; - name = "kblog-15.08.3.tar.xz"; - }; - }; - kbounce = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kbounce-15.08.3.tar.xz"; - sha256 = "1rn0irm4by01k6k61iam2m27m5dc8i0fi025h4rwmyfqx9hn6f9i"; - name = "kbounce-15.08.3.tar.xz"; - }; - }; - kbreakout = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kbreakout-15.08.3.tar.xz"; - sha256 = "069y45gyi92zm3hyil7ggm6gnimz7wj4g543lix4fx28kd7m044v"; - name = "kbreakout-15.08.3.tar.xz"; - }; - }; - kbruch = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kbruch-15.08.3.tar.xz"; - sha256 = "0panrkmaid998i276wn3jsvmrhq1f7nj20yh9vva3mrc7y0bvhg3"; - name = "kbruch-15.08.3.tar.xz"; - }; - }; - kcachegrind = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcachegrind-15.08.3.tar.xz"; - sha256 = "0hjv28j5lcdxcmdihnyal03gqjfi8lfwxhdlxbzar9dr7r8azg4p"; - name = "kcachegrind-15.08.3.tar.xz"; - }; - }; - kcalc = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcalc-15.08.3.tar.xz"; - sha256 = "1in0b2i58s6sv6fz9z3bqaxby0d33arwmq4gazvc2kzhfxylq501"; - name = "kcalc-15.08.3.tar.xz"; - }; - }; - kcalcore = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcalcore-15.08.3.tar.xz"; - sha256 = "07wpls28xw3pis9l3fmmn64af3n21nv53b9ip6ycflxn3xcqmap8"; - name = "kcalcore-15.08.3.tar.xz"; - }; - }; - kcalutils = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcalutils-15.08.3.tar.xz"; - sha256 = "12h41bnp6vvqcfy8pm2nhqypaggaj7sgh22by8w75qvimb94ddiz"; - name = "kcalutils-15.08.3.tar.xz"; - }; - }; - kcharselect = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcharselect-15.08.3.tar.xz"; - sha256 = "0iy3n8pb5xa6aj1zhbxqpk278c5k4vs9bw0i8jww3id0cwggardn"; - name = "kcharselect-15.08.3.tar.xz"; - }; - }; - kcolorchooser = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcolorchooser-15.08.3.tar.xz"; - sha256 = "1wyjm4d47xm5lflrd63xgwll6xjpxgnc0h8xjk4rrc6nf43w6bn1"; - name = "kcolorchooser-15.08.3.tar.xz"; - }; - }; - kcontacts = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcontacts-15.08.3.tar.xz"; - sha256 = "0j6ag6knz4z76md7bnizx5fwzsqavxbfz33hdpdw6606m5d66j5p"; - name = "kcontacts-15.08.3.tar.xz"; - }; - }; - kcron = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kcron-15.08.3.tar.xz"; - sha256 = "04z8pq5mc1kjvhnkmzgymzs9inynxdkiddq70hs7y94fbfsq2rf0"; - name = "kcron-15.08.3.tar.xz"; - }; - }; - kdeartwork = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz"; - sha256 = "031v00f4b1jg5z7qlgycjsjiz1hyn6svm9n4mkiybrida2hf6gzv"; - name = "kdeartwork-15.08.3.tar.xz"; - }; - }; - kde-baseapps = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-baseapps-15.08.3.tar.xz"; - sha256 = "0n010z1b0hdj5rdw8p9y28vkai5knfwkgasrw8knvildcfifp913"; - name = "kde-baseapps-15.08.3.tar.xz"; - }; - }; - kde-base-artwork = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-base-artwork-15.08.3.tar.xz"; - sha256 = "054rc5llv2cxkc0yss8i7rnp6dp10srl0g6sxvwm4w9hvicxp1gg"; - name = "kde-base-artwork-15.08.3.tar.xz"; - }; - }; - kdebugsettings = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdebugsettings-15.08.3.tar.xz"; - sha256 = "0jy8gpydkis8jpb0vax6w41rj2hwwp8jvbiif438bvvfwyakx7dk"; - name = "kdebugsettings-15.08.3.tar.xz"; - }; - }; - kde-dev-scripts = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-dev-scripts-15.08.3.tar.xz"; - sha256 = "1zc75alr7ap8i5njfn00d7rzvzmazyxq44zi7fs1p9zcv3lz3gli"; - name = "kde-dev-scripts-15.08.3.tar.xz"; - }; - }; - kde-dev-utils = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-dev-utils-15.08.3.tar.xz"; - sha256 = "06k6iwgaimryhm0lma5m2nmrj1gf9y0fbxnzswxl3cygsvabffyf"; - name = "kde-dev-utils-15.08.3.tar.xz"; - }; - }; - kdeedu-data = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdeedu-data-15.08.3.tar.xz"; - sha256 = "1x91cqjjxaxdvh5fl3jlhnpj344r0j1qgmyw7x1cq05r3spdk47w"; - name = "kdeedu-data-15.08.3.tar.xz"; - }; - }; - kdegraphics-mobipocket = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-mobipocket-15.08.3.tar.xz"; - sha256 = "0p1i57m86r21y8zd9lz6rr28ir0jqwy7nmlxkrkpllgd4r3xalhp"; - name = "kdegraphics-mobipocket-15.08.3.tar.xz"; - }; - }; - kdegraphics-strigi-analyzer = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-strigi-analyzer-15.08.3.tar.xz"; - sha256 = "1nsi48i2qpa3gddwy3ib7a59i8a96p49nm48xisn2sym34mi31cq"; - name = "kdegraphics-strigi-analyzer-15.08.3.tar.xz"; - }; - }; - kdegraphics-thumbnailers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-thumbnailers-15.08.3.tar.xz"; - sha256 = "1ffs3ck1zl4795w73gjiwc146a6f2iqqiy4grmgnmg89irbqcnv7"; - name = "kdegraphics-thumbnailers-15.08.3.tar.xz"; - }; - }; - kde-l10n-ar = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz"; - sha256 = "0kp82s1h3rmlizm7kb4f5iyr8ljlysic7vqawzv8qnga00w0r90f"; - name = "kde-l10n-ar-15.08.3.tar.xz"; - }; - }; - kde-l10n-bg = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz"; - sha256 = "1769sr2qh3qblz28m104a3jgc0fg4bwy4annfyr2n48sizyan3qd"; - name = "kde-l10n-bg-15.08.3.tar.xz"; - }; - }; - kde-l10n-bs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz"; - sha256 = "16lgja0cnf8v4szyb2nhlwzpnrzxhhbvjd7w6j0ryfrnrxfd6x7n"; - name = "kde-l10n-bs-15.08.3.tar.xz"; - }; - }; - kde-l10n-ca = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz"; - sha256 = "03hy9qi1lnwv73vn9phrcwr8m0jcj65d18jci01pvbpaj483pmxk"; - name = "kde-l10n-ca-15.08.3.tar.xz"; - }; - }; - kde-l10n-ca_valencia = { - version = "ca_valencia-15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz"; - sha256 = "0h47xlgmlk527mafs834fswplpb8mrma4li247n1lyabyz6m6vhd"; - name = "kde-l10n-ca_valencia-15.08.3.tar.xz"; - }; - }; - kde-l10n-cs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz"; - sha256 = "0w403x63nj27iv0lag691a88q15sf5jq0hqylgijcsl6djf1jd66"; - name = "kde-l10n-cs-15.08.3.tar.xz"; - }; - }; - kde-l10n-da = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz"; - sha256 = "0v3rqc9mzg748qj0g1qm5g2qzjwlhrspkq4dryj792nj5d81xlmx"; - name = "kde-l10n-da-15.08.3.tar.xz"; - }; - }; - kde-l10n-de = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz"; - sha256 = "0mvdf3ixc5nfrbv5j84pb668wkckcliswcdgd2laasv3s7a57mrg"; - name = "kde-l10n-de-15.08.3.tar.xz"; - }; - }; - kde-l10n-el = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz"; - sha256 = "0ywgk884l4kvqgaags7k87pm00241pygx630mc4ssrsw3nplv5lh"; - name = "kde-l10n-el-15.08.3.tar.xz"; - }; - }; - kde-l10n-en_GB = { - version = "en_GB-15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz"; - sha256 = "002apvwkmmjqk0z5zrbbrri2wndg439xiwgkdr110a0hvak5v0nl"; - name = "kde-l10n-en_GB-15.08.3.tar.xz"; - }; - }; - kde-l10n-eo = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz"; - sha256 = "144lrkjchx4gxzj7isfyrcmbbmpgy4a1v1v9cc4a8hf9c1kxzglk"; - name = "kde-l10n-eo-15.08.3.tar.xz"; - }; - }; - kde-l10n-es = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz"; - sha256 = "160zsf6gss1ngz7pj4gykba83mwdi2id406plab5xznkqyanmp1v"; - name = "kde-l10n-es-15.08.3.tar.xz"; - }; - }; - kde-l10n-et = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz"; - sha256 = "19gaswa1l5rlbh2k0b2bvbwafp6rnq3l6h5dv8q4yqhz1wsxcssr"; - name = "kde-l10n-et-15.08.3.tar.xz"; - }; - }; - kde-l10n-eu = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz"; - sha256 = "1mrq2psh5n8gp1iqz41ilqwalpcyznjjqwmv2grf4ay9ss3ljbq0"; - name = "kde-l10n-eu-15.08.3.tar.xz"; - }; - }; - kde-l10n-fa = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz"; - sha256 = "0axhz589y8zwl45hgi6wfy7ns50d1d3837j5mbl6ghvgs2bayfrj"; - name = "kde-l10n-fa-15.08.3.tar.xz"; - }; - }; - kde-l10n-fi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz"; - sha256 = "1xk5isp34xmv6rj2xsfjsjfwzbnc3db7jx2kp0a046n1ysv9g6q5"; - name = "kde-l10n-fi-15.08.3.tar.xz"; - }; - }; - kde-l10n-fr = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz"; - sha256 = "1bwp3d0c9654f7m8670gasba67zrhwggvzz3rrcl2x188a10483x"; - name = "kde-l10n-fr-15.08.3.tar.xz"; - }; - }; - kde-l10n-ga = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz"; - sha256 = "1zgk73ykybjxpl9zh7g5i86ygfvqiaimhg2nxxnb82maq2ba8p7y"; - name = "kde-l10n-ga-15.08.3.tar.xz"; - }; - }; - kde-l10n-gl = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz"; - sha256 = "0czfkcki0qd48rhn7nxww8961gn7lw06ydnd7d7a4isq9aw6649q"; - name = "kde-l10n-gl-15.08.3.tar.xz"; - }; - }; - kde-l10n-he = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz"; - sha256 = "0p89y331kbkkl8pbdsqjpf30qqdgpzrchnmpl3wvkv6zgq0m58i7"; - name = "kde-l10n-he-15.08.3.tar.xz"; - }; - }; - kde-l10n-hi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz"; - sha256 = "0n7p1vndyfmddcgm182nmbxppjiqpq2agm8dziddxvqsmb2pmrfg"; - name = "kde-l10n-hi-15.08.3.tar.xz"; - }; - }; - kde-l10n-hr = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz"; - sha256 = "0nz0jj90zky4r5zphcy7pyblx00xh2i90fklddz1519afzxjzvc6"; - name = "kde-l10n-hr-15.08.3.tar.xz"; - }; - }; - kde-l10n-hu = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz"; - sha256 = "0v4273knbz9q0jqwgljhxwwryfp4y5nd791qf4nnci8zngyrkwi4"; - name = "kde-l10n-hu-15.08.3.tar.xz"; - }; - }; - kde-l10n-ia = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz"; - sha256 = "1h4y8b0pn4a19cnvbgsr6ypcy77b3wfh0jn34rnbnvzmwgbbsdgq"; - name = "kde-l10n-ia-15.08.3.tar.xz"; - }; - }; - kde-l10n-id = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz"; - sha256 = "1rcrpm05lwn4caaxg9zshvn7wvyjx2a580axyxfaldqbgzr4s4nl"; - name = "kde-l10n-id-15.08.3.tar.xz"; - }; - }; - kde-l10n-is = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz"; - sha256 = "1g40y3y9v88zi2ikzldi818khh4v1sgwfxajx7g37b8f713d5mk3"; - name = "kde-l10n-is-15.08.3.tar.xz"; - }; - }; - kde-l10n-it = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz"; - sha256 = "1qb42pkj0b4nl6bf5dq5aiirm58divgz1xacrnrlgmis10rm04w6"; - name = "kde-l10n-it-15.08.3.tar.xz"; - }; - }; - kde-l10n-ja = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz"; - sha256 = "0d4yd9x6gsabfhz22vbab7m30m31c92azhkchnxf4yhwa7x50aay"; - name = "kde-l10n-ja-15.08.3.tar.xz"; - }; - }; - kde-l10n-kk = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz"; - sha256 = "00gwacqv00mqm262iard2jbfdwz7m5cap08k0iyw931kccdlg5k4"; - name = "kde-l10n-kk-15.08.3.tar.xz"; - }; - }; - kde-l10n-km = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz"; - sha256 = "0mc0w39262n00q1l8qkjgfwh7w3kwpfzq1y5qsldg948lppk8i5l"; - name = "kde-l10n-km-15.08.3.tar.xz"; - }; - }; - kde-l10n-ko = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz"; - sha256 = "1bzkx74ymbwazpwm0pdjgq1pqi3x7wlq9v0h63q53wx89ald7lzj"; - name = "kde-l10n-ko-15.08.3.tar.xz"; - }; - }; - kde-l10n-lt = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz"; - sha256 = "0xkrxp815pbssb1myfchzjyxxgswznvimxdi29kckprsfhrycss9"; - name = "kde-l10n-lt-15.08.3.tar.xz"; - }; - }; - kde-l10n-lv = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz"; - sha256 = "0rrnydq93rwg1j19vyw2g8d1zmql8yrdiqar6qsck5jljdhwzynv"; - name = "kde-l10n-lv-15.08.3.tar.xz"; - }; - }; - kde-l10n-mr = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz"; - sha256 = "1kwypcdd3myw53gd0cwz8v43cfdfqhnnq5qrwcfyv6myv2sf1xg4"; - name = "kde-l10n-mr-15.08.3.tar.xz"; - }; - }; - kde-l10n-nb = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz"; - sha256 = "0blhr196gi1f3m8big82gf01qghj5f3nd8nzxx7i96lmvdc3k8na"; - name = "kde-l10n-nb-15.08.3.tar.xz"; - }; - }; - kde-l10n-nds = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz"; - sha256 = "117xh1vh3fb23v7i6n9ljn4va3jvqy55mbz3zc997df79mkq0c02"; - name = "kde-l10n-nds-15.08.3.tar.xz"; - }; - }; - kde-l10n-nl = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz"; - sha256 = "1zjjsq8p5ipj5rn9wl9jsixx1pj0ffdnq2myhb727z5lw07nafy9"; - name = "kde-l10n-nl-15.08.3.tar.xz"; - }; - }; - kde-l10n-nn = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz"; - sha256 = "198x0kdj7w7iqx43llnwb01wshfzjkv2vdazyh7ip86r8whxrika"; - name = "kde-l10n-nn-15.08.3.tar.xz"; - }; - }; - kde-l10n-pa = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz"; - sha256 = "0i69lf888p4sahms347r1wadni5zg7d9w9a9vv02g7lk193n3r07"; - name = "kde-l10n-pa-15.08.3.tar.xz"; - }; - }; - kde-l10n-pl = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz"; - sha256 = "13b28slaqgwnqi2vw7mclyrbgrfhbpv5w4wb6l1mk6kv6ksh48a2"; - name = "kde-l10n-pl-15.08.3.tar.xz"; - }; - }; - kde-l10n-pt = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz"; - sha256 = "046v644pqvg6nfc767mpgzn8bsrgakmqs94x55cg1y76q5v7fncs"; - name = "kde-l10n-pt-15.08.3.tar.xz"; - }; - }; - kde-l10n-pt_BR = { - version = "pt_BR-15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz"; - sha256 = "0kp71wgyrvbvrrlj46fnbjc7bh04wvqdnrv8grxc7zbn037m1kax"; - name = "kde-l10n-pt_BR-15.08.3.tar.xz"; - }; - }; - kde-l10n-ro = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz"; - sha256 = "0h3l3yb72v8lg6jzsczm37zilsidihjlfpaxbmjvyka440m3rhgz"; - name = "kde-l10n-ro-15.08.3.tar.xz"; - }; - }; - kde-l10n-ru = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz"; - sha256 = "0drxf6jpd6gd7wnqz3pa2f3x9ay1bsfycyahsbqny6vkqbas18rn"; - name = "kde-l10n-ru-15.08.3.tar.xz"; - }; - }; - kde-l10n-sk = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz"; - sha256 = "0jv5blx2biwpvazr6cc8kmvgqjp3ixmf547q453wkyrss9sg6n7y"; - name = "kde-l10n-sk-15.08.3.tar.xz"; - }; - }; - kde-l10n-sl = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz"; - sha256 = "1nnjxwhidfw5iyp1rl5sdqpkk3jn1p4csa7v05qssydplqz86plp"; - name = "kde-l10n-sl-15.08.3.tar.xz"; - }; - }; - kde-l10n-sr = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz"; - sha256 = "0dqca94al2x68jyb7zq52vf2zirqlh6bqcgrnvd2h3gkz8yifgkf"; - name = "kde-l10n-sr-15.08.3.tar.xz"; - }; - }; - kde-l10n-sv = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz"; - sha256 = "1xa31mdcmlw955ybzfpas7fq38ffh9s00v1jvzpys008hhs5y4mr"; - name = "kde-l10n-sv-15.08.3.tar.xz"; - }; - }; - kde-l10n-tr = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz"; - sha256 = "0hfl5jbwkfhwpv1kbbcvinzbp6vks7kfn0s8n6c989icnr4y6p18"; - name = "kde-l10n-tr-15.08.3.tar.xz"; - }; - }; - kde-l10n-ug = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz"; - sha256 = "0aznwrbzvw4zh20zgrmbyvwg0f639vibsq7vf38z3bn1acw22cyh"; - name = "kde-l10n-ug-15.08.3.tar.xz"; - }; - }; - kde-l10n-uk = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz"; - sha256 = "01h65ysizlcfbn3iim3pgs17y8l8q7qnsf1skqwh6ryib3z20l7d"; - name = "kde-l10n-uk-15.08.3.tar.xz"; - }; - }; - kde-l10n-wa = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz"; - sha256 = "0pm4fcziv3jci6vdggxk1mlhfpppm1pgk035rzg8004yhj84mds1"; - name = "kde-l10n-wa-15.08.3.tar.xz"; - }; - }; - kde-l10n-zh_CN = { - version = "zh_CN-15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz"; - sha256 = "0cnahayw2nf23r7gks34y3llqsiljxv0v20v26nwarj7dcj4r7zv"; - name = "kde-l10n-zh_CN-15.08.3.tar.xz"; - }; - }; - kde-l10n-zh_TW = { - version = "zh_TW-15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz"; - sha256 = "1sbfwwvqr6arckzdhs77ar9yz66f4bv1xndw05lpj899k3vd6mp4"; - name = "kde-l10n-zh_TW-15.08.3.tar.xz"; - }; - }; - kdelibs = { - version = "4.14.14"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdelibs-4.14.14.tar.xz"; - sha256 = "055nq12rgilcb3m8gwjxwpalrj7bv2hjvf2h0axba4bjjl99n6b3"; - name = "kdelibs-4.14.14.tar.xz"; - }; - }; - kdenetwork-filesharing = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-filesharing-15.08.3.tar.xz"; - sha256 = "0fh11nrlmariyy1rn1ncsjzydidpfwqhr6r73mi8mqbry7vm1kp5"; - name = "kdenetwork-filesharing-15.08.3.tar.xz"; - }; - }; - kdenetwork-strigi-analyzers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-strigi-analyzers-15.08.3.tar.xz"; - sha256 = "0adrr6clw75rqjcw1611xwzxb2ma6c4jcawrl5k3xa46qg37g4gk"; - name = "kdenetwork-strigi-analyzers-15.08.3.tar.xz"; - }; - }; - kdenlive = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdenlive-15.08.3.tar.xz"; - sha256 = "0k8x3wipndrg2d424i16bbnnjfv3b43v48jrid28r9vas4b7xghk"; - name = "kdenlive-15.08.3.tar.xz"; - }; - }; - kdepim = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdepim-15.08.3.tar.xz"; - sha256 = "1rpscplpawlqcya17p27gf25rqrv819xrp6vdk44c9p9jw31q4hz"; - name = "kdepim-15.08.3.tar.xz"; - }; - }; - kdepimlibs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdepimlibs-15.08.3.tar.xz"; - sha256 = "0ad20g2wngf265zflaq8h2s25p911llaknf0ni3r63nb4px4jhlw"; - name = "kdepimlibs-15.08.3.tar.xz"; - }; - }; - kdepim-runtime = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdepim-runtime-15.08.3.tar.xz"; - sha256 = "0lrwkkjgw8w5r5wgl5d006ainy5dnkpz8kdvbmbgb4hpvj79zba1"; - name = "kdepim-runtime-15.08.3.tar.xz"; - }; - }; - kde-runtime = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-runtime-15.08.3.tar.xz"; - sha256 = "0n9nkbmdyf49aw1d85y8g9mx3rs3xnsy34izrbnwa35q9sjg3bsr"; - name = "kde-runtime-15.08.3.tar.xz"; - }; - }; - kdesdk-kioslaves = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdesdk-kioslaves-15.08.3.tar.xz"; - sha256 = "04kyfham56hzwyqydgplqkmn3888wfxsr4hl1690w61qx8m60x3a"; - name = "kdesdk-kioslaves-15.08.3.tar.xz"; - }; - }; - kdesdk-strigi-analyzers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdesdk-strigi-analyzers-15.08.3.tar.xz"; - sha256 = "0dy60s6idbhy3anxqkk8cjrsnb5p1gizhzrxlq9kv2sk3rld1pxc"; - name = "kdesdk-strigi-analyzers-15.08.3.tar.xz"; - }; - }; - kdesdk-thumbnailers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdesdk-thumbnailers-15.08.3.tar.xz"; - sha256 = "077p0alajih4pq3g6k24a3cmsz61kb32iq1mzlkrbq8myadrkz86"; - name = "kdesdk-thumbnailers-15.08.3.tar.xz"; - }; - }; - kde-wallpapers = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz"; - sha256 = "14wm02ywncd4n0ppwgzag467vp5h0005csnl6na2bb2qrcplpbjd"; - name = "kde-wallpapers-15.08.3.tar.xz"; - }; - }; - kdewebdev = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdewebdev-15.08.3.tar.xz"; - sha256 = "1nsfmff34wpb9cmrmlj32yqihx4aha0bkn7h0j2jvkhqqnwxr802"; - name = "kdewebdev-15.08.3.tar.xz"; - }; - }; - kdf = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdf-15.08.3.tar.xz"; - sha256 = "05lfhivnj332m7br03pm0jflsdsv2kvzxadiic8gmm05yvx6k442"; - name = "kdf-15.08.3.tar.xz"; - }; - }; - kdiamond = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kdiamond-15.08.3.tar.xz"; - sha256 = "1i2wr0fcqi8sji82m6frknvjd8dyvx9p0a8m2b75a5bl4ww95k0b"; - name = "kdiamond-15.08.3.tar.xz"; - }; - }; - kfloppy = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kfloppy-15.08.3.tar.xz"; - sha256 = "0gbagm6jkjj4gmpq0asjgngn3np5b77hry733krzglawdf4dh7jh"; - name = "kfloppy-15.08.3.tar.xz"; - }; - }; - kfourinline = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kfourinline-15.08.3.tar.xz"; - sha256 = "01d94irpyq3z01yvcffw3h5qm8mbcipb855wi3na2ply8jm1kj1s"; - name = "kfourinline-15.08.3.tar.xz"; - }; - }; - kgeography = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kgeography-15.08.3.tar.xz"; - sha256 = "1wfq98dhs2g1k8gw1p98slgyf3f1amwrkqf4ja4hsm4lcxqhmrh5"; - name = "kgeography-15.08.3.tar.xz"; - }; - }; - kget = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kget-15.08.3.tar.xz"; - sha256 = "1wrpjm2hjhl7bz70ga71xmys7jnwq9xyvdr7glb3032z2w52sld5"; - name = "kget-15.08.3.tar.xz"; - }; - }; - kgoldrunner = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kgoldrunner-15.08.3.tar.xz"; - sha256 = "1xxgj46l3b7a8wmas7wsx8h9bg4hgcgiasx3dz27v870i01wzh7i"; - name = "kgoldrunner-15.08.3.tar.xz"; - }; - }; - kgpg = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kgpg-15.08.3.tar.xz"; - sha256 = "09am74pb3hs24z3npml98rsbsxzincn85wgvpym02f4gnc5abd42"; - name = "kgpg-15.08.3.tar.xz"; - }; - }; - khangman = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/khangman-15.08.3.tar.xz"; - sha256 = "0fyy37v0ljv1mvxfd4p6x6lflqfmsh703p9j0mb0bd2f6wswwa1l"; - name = "khangman-15.08.3.tar.xz"; - }; - }; - kholidays = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kholidays-15.08.3.tar.xz"; - sha256 = "0vf7pz6i2raw94mcxfzlk9s5hxnampx5lq5b5iyfad5d5vc24215"; - name = "kholidays-15.08.3.tar.xz"; - }; - }; - kidentitymanagement = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kidentitymanagement-15.08.3.tar.xz"; - sha256 = "0napyckxdv4vnj7n063qgiwa7xgwjab5qnz8rl1g60kidvvz7vw0"; - name = "kidentitymanagement-15.08.3.tar.xz"; - }; - }; - kig = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kig-15.08.3.tar.xz"; - sha256 = "15fws8yrdyz68qik1gf3fchrdfyk0mml9p923dzirb6faaz1sfpx"; - name = "kig-15.08.3.tar.xz"; - }; - }; - kigo = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kigo-15.08.3.tar.xz"; - sha256 = "0h48kqadfhlm2jppld9ima4bbzgxnwcfg0y6zbhsvflavi6cpckn"; - name = "kigo-15.08.3.tar.xz"; - }; - }; - killbots = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/killbots-15.08.3.tar.xz"; - sha256 = "1zp68p83adi1qggs8j3pa5rgfdjqy5c4pmc9kp0ndcpk7hi7nwvz"; - name = "killbots-15.08.3.tar.xz"; - }; - }; - kimap = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kimap-15.08.3.tar.xz"; - sha256 = "1wymg2s8yjckzc6zrb56fslbfbvzg41mi5fvnrf54d92lh4s90p0"; - name = "kimap-15.08.3.tar.xz"; - }; - }; - kio-extras = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kio-extras-15.08.3.tar.xz"; - sha256 = "0psi8hj9s961l9xga92g9amv95h0im3nm12fc6vh184h2by2gddf"; - name = "kio-extras-15.08.3.tar.xz"; - }; - }; - kiriki = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kiriki-15.08.3.tar.xz"; - sha256 = "1w9yb38wwi45f8dfsi7wvaq6l9crjb6v0kp74cmaljgvirs3mmjk"; - name = "kiriki-15.08.3.tar.xz"; - }; - }; - kiten = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kiten-15.08.3.tar.xz"; - sha256 = "0rj4rka4wk3zh0s04ry8r4hqhajsi53qv1ns6ra1mbl1v32bw20g"; - name = "kiten-15.08.3.tar.xz"; - }; - }; - kjumpingcube = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kjumpingcube-15.08.3.tar.xz"; - sha256 = "0ccf3zcc31n78ing87h16rjk5kylz7k36lvgp4c9w6w8ahmgzp8g"; - name = "kjumpingcube-15.08.3.tar.xz"; - }; - }; - kldap = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kldap-15.08.3.tar.xz"; - sha256 = "1rnl40367fxq4cgqrrm27a93k3b6gns47gxv2afvjpq7dn142dc2"; - name = "kldap-15.08.3.tar.xz"; - }; - }; - klettres = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/klettres-15.08.3.tar.xz"; - sha256 = "14bbjx20zn5gmxhkgarh7y75j5806rpzbbh0rj2w2lpav8ggma90"; - name = "klettres-15.08.3.tar.xz"; - }; - }; - klickety = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/klickety-15.08.3.tar.xz"; - sha256 = "1vqflsi4k21qj91z7h6hprswpzr7zpdnpkvwwiw2v2zwi4p8m967"; - name = "klickety-15.08.3.tar.xz"; - }; - }; - klines = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/klines-15.08.3.tar.xz"; - sha256 = "103wws54y0sal9w3ikbmksq0d2ndw34xpr972zjcmw06py4kx4kn"; - name = "klines-15.08.3.tar.xz"; - }; - }; - kmag = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmag-15.08.3.tar.xz"; - sha256 = "1hmyc2n8gspd46k4g3k6jh0cfy7r0v5x17l7xrvj45nmhhhnivc0"; - name = "kmag-15.08.3.tar.xz"; - }; - }; - kmahjongg = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmahjongg-15.08.3.tar.xz"; - sha256 = "07xsmd0zh9n01cy0fra2njz2qcgp1y7y5w9v4s2bkj3a4gd35ag8"; - name = "kmahjongg-15.08.3.tar.xz"; - }; - }; - kmailtransport = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmailtransport-15.08.3.tar.xz"; - sha256 = "0g8983wq7x4w19k0fxypsk69hi5nrxldvq0a49jna2g2yfxi8w5l"; - name = "kmailtransport-15.08.3.tar.xz"; - }; - }; - kmbox = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmbox-15.08.3.tar.xz"; - sha256 = "11fsvjmidb9s309wlcchgmb4viambqmw1njy6g5c2zpyfw9ryq8b"; - name = "kmbox-15.08.3.tar.xz"; - }; - }; - kmime = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmime-15.08.3.tar.xz"; - sha256 = "16pfzjdiaa9z2nq564bcrb82f50zh1cd8zyx7jzwzzw6cspv5n0q"; - name = "kmime-15.08.3.tar.xz"; - }; - }; - kmines = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmines-15.08.3.tar.xz"; - sha256 = "18ld9y50axz77cspm1rccm0w21h01zihbh0880gf2vjqwcv1ifxc"; - name = "kmines-15.08.3.tar.xz"; - }; - }; - kmix = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmix-15.08.3.tar.xz"; - sha256 = "0mkh7jvn26d6i38zzinx2gh9bl50scis17maj56c9m67i4m0hlk9"; - name = "kmix-15.08.3.tar.xz"; - }; - }; - kmousetool = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmousetool-15.08.3.tar.xz"; - sha256 = "07ddvl9nmigqq12mz27x0gw3lhb8a6ilfmqlx5sm810cp7b4claq"; - name = "kmousetool-15.08.3.tar.xz"; - }; - }; - kmouth = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmouth-15.08.3.tar.xz"; - sha256 = "1m0y8fdyh1glh27azi700zzvdpki0chjphnq5gx9339hbf97bdi4"; - name = "kmouth-15.08.3.tar.xz"; - }; - }; - kmplot = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kmplot-15.08.3.tar.xz"; - sha256 = "1zk8ccl2yhxgi18qkabjzm4ffcyg6flvvh3fy3hz7l1cikb6dza1"; - name = "kmplot-15.08.3.tar.xz"; - }; - }; - knavalbattle = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/knavalbattle-15.08.3.tar.xz"; - sha256 = "1g1dy0a0rvil31rj4s0z8gic9nb9xpx6xl7b91a36wj6cab57434"; - name = "knavalbattle-15.08.3.tar.xz"; - }; - }; - knetwalk = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/knetwalk-15.08.3.tar.xz"; - sha256 = "0iapwmdy7i9dps3jf7ski75xdjg4bkp0fhz9njng11yx1g3a64qi"; - name = "knetwalk-15.08.3.tar.xz"; - }; - }; - kolf = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kolf-15.08.3.tar.xz"; - sha256 = "1akvicna1wzjcjdz2nz2mydmv9f39rff6jwcbj6blgdr1q56p4q7"; - name = "kolf-15.08.3.tar.xz"; - }; - }; - kollision = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kollision-15.08.3.tar.xz"; - sha256 = "1r9ijp1bgl20rv76if09695bkc5yrr99sn1s0193fjjh34fpd0w8"; - name = "kollision-15.08.3.tar.xz"; - }; - }; - kolourpaint = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kolourpaint-15.08.3.tar.xz"; - sha256 = "1miq2jvmqkgcwpzh2vzzb2dvmb8ziwr767ss5daqv540gpc8crjr"; - name = "kolourpaint-15.08.3.tar.xz"; - }; - }; - kompare = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kompare-15.08.3.tar.xz"; - sha256 = "067m9xrnx6smscsk7wq9d8j2sv0g7ayfrdjwf4xsfa5jz8fh32s5"; - name = "kompare-15.08.3.tar.xz"; - }; - }; - konquest = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/konquest-15.08.3.tar.xz"; - sha256 = "1v760lh6wx8kqyyrw2vb48n5x0ccl12dr3gy5dxyrs9sn0jpwz4r"; - name = "konquest-15.08.3.tar.xz"; - }; - }; - konsole = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/konsole-15.08.3.tar.xz"; - sha256 = "0kpizwk3vwp25sincqnjrmvrhwv2a7vgacnw4yp2bxvdqqrb4zhr"; - name = "konsole-15.08.3.tar.xz"; - }; - }; - kontactinterface = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kontactinterface-15.08.3.tar.xz"; - sha256 = "1www2daa48r43dii2fb9s0x2ll3bsvhxnllypcs2fy5gzaj6wrff"; - name = "kontactinterface-15.08.3.tar.xz"; - }; - }; - kopete = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kopete-15.08.3.tar.xz"; - sha256 = "1x05w7ls0298shwr10f0vcbxcd0rvfvgfcwz2c5jrgb1zf968k8c"; - name = "kopete-15.08.3.tar.xz"; - }; - }; - kpat = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kpat-15.08.3.tar.xz"; - sha256 = "16lmrlxxl3kibzflw3lvcbp7xmklr4jqwh1aqqxw5lbybkz2vnah"; - name = "kpat-15.08.3.tar.xz"; - }; - }; - kpimtextedit = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kpimtextedit-15.08.3.tar.xz"; - sha256 = "1q1a77wnwny7j777vrhbqlz6z1z7jmil8raii4nbrwjqpdw8fc92"; - name = "kpimtextedit-15.08.3.tar.xz"; - }; - }; - kppp = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kppp-15.08.3.tar.xz"; - sha256 = "0q5542f9aa98w94krib84yrjsk3ialaq43vd9bbdvf0j5wfzb276"; - name = "kppp-15.08.3.tar.xz"; - }; - }; - kqtquickcharts = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kqtquickcharts-15.08.3.tar.xz"; - sha256 = "0ppifqc9bz8hljniw6h5a31k38qbij9ydpwjzpg11m0s8a4havmm"; - name = "kqtquickcharts-15.08.3.tar.xz"; - }; - }; - krdc = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/krdc-15.08.3.tar.xz"; - sha256 = "1vcfx703bniac9l7g6cg031nb18blypxb1i84dwfjavr4ib2im8l"; - name = "krdc-15.08.3.tar.xz"; - }; - }; - kremotecontrol = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kremotecontrol-15.08.3.tar.xz"; - sha256 = "0nxbw1zl8lcc9nvj5damz7m5q6bijm8mjx7isccf7j6mjazdxcin"; - name = "kremotecontrol-15.08.3.tar.xz"; - }; - }; - kreversi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kreversi-15.08.3.tar.xz"; - sha256 = "1806m071wgnjg01lrjii9nh7spiwxm9cf0jl0gib7fk2cw9kw2fa"; - name = "kreversi-15.08.3.tar.xz"; - }; - }; - krfb = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/krfb-15.08.3.tar.xz"; - sha256 = "0dil3qpkf8m9449aqawjrilwvickb3nl3msj2g3svdnfvak7cv61"; - name = "krfb-15.08.3.tar.xz"; - }; - }; - kross-interpreters = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kross-interpreters-15.08.3.tar.xz"; - sha256 = "1msy3xg5n5g2ax074g23j889dadqn4mbqa3r5mlmdaz9bnny1n9r"; - name = "kross-interpreters-15.08.3.tar.xz"; - }; - }; - kruler = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kruler-15.08.3.tar.xz"; - sha256 = "1mr1pzn776a7xgq0rwqdn635s9y2bl0bh53i1c99h32jbxhn6fhb"; - name = "kruler-15.08.3.tar.xz"; - }; - }; - ksaneplugin = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksaneplugin-15.08.3.tar.xz"; - sha256 = "18mpjl21rmbw95zc2b8f9sgi2sh922p0qj8d3jfhs3gggjy5hjfb"; - name = "ksaneplugin-15.08.3.tar.xz"; - }; - }; - kscd = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kscd-15.08.3.tar.xz"; - sha256 = "0pqr342swpbwkqq7qwn7zs97kmbqpmwrlkkk0amaadgsfd9c9j40"; - name = "kscd-15.08.3.tar.xz"; - }; - }; - kshisen = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kshisen-15.08.3.tar.xz"; - sha256 = "0xx8lwxw4zfzwzaqdi1v7g00vzy74arfbfhvkxgs6k1gvhja0ckk"; - name = "kshisen-15.08.3.tar.xz"; - }; - }; - ksirk = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksirk-15.08.3.tar.xz"; - sha256 = "1y6y0dcgvrpflfmircbf3nj7mjgvkbnddlmbxsws4h0737lqkg21"; - name = "ksirk-15.08.3.tar.xz"; - }; - }; - ksnakeduel = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksnakeduel-15.08.3.tar.xz"; - sha256 = "1zpz3fa9lp44iv5kxdwy1sk93bpkin9h64n6qj0lcpjj3f8a5cy5"; - name = "ksnakeduel-15.08.3.tar.xz"; - }; - }; - ksnapshot = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksnapshot-15.08.3.tar.xz"; - sha256 = "1xnbf73dr8z95kwq047zwjl0yml25nbnw5gnc319q2nlcnxk5gc3"; - name = "ksnapshot-15.08.3.tar.xz"; - }; - }; - kspaceduel = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kspaceduel-15.08.3.tar.xz"; - sha256 = "12dbdybqfd5klfg427q48rbv2s63ybanay8c5d44znwk5qi9wwf7"; - name = "kspaceduel-15.08.3.tar.xz"; - }; - }; - ksquares = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksquares-15.08.3.tar.xz"; - sha256 = "1jr7slw9ml01zffj5kjv56fmwq8snz0jxdkczr2crr15cljrsmwj"; - name = "ksquares-15.08.3.tar.xz"; - }; - }; - kstars = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kstars-15.08.3.tar.xz"; - sha256 = "17n2g1a53ps0cx1s62qz1s7yn8nn0sgq0p4ifdyq9rk5iwaq5yp8"; - name = "kstars-15.08.3.tar.xz"; - }; - }; - ksudoku = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksudoku-15.08.3.tar.xz"; - sha256 = "0rw02qdvv132i6gf2n1v37b7rmahzmmz5jx174j1syda4wwpyhgr"; - name = "ksudoku-15.08.3.tar.xz"; - }; - }; - ksystemlog = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ksystemlog-15.08.3.tar.xz"; - sha256 = "12gacxya366rln3q9m2vzv28irrwnsj4lb1pqymxvsfyijfsjd7x"; - name = "ksystemlog-15.08.3.tar.xz"; - }; - }; - kteatime = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kteatime-15.08.3.tar.xz"; - sha256 = "1yij4230wc7qc9wzj5kam6jjv97xdcnz57j0kpa54iw1c3camwlx"; - name = "kteatime-15.08.3.tar.xz"; - }; - }; - ktimer = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktimer-15.08.3.tar.xz"; - sha256 = "06p2dar8ry4xrkn21npxsnfkxq92sg66lmrnhqpkzv3dcvz98n50"; - name = "ktimer-15.08.3.tar.xz"; - }; - }; - ktnef = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktnef-15.08.3.tar.xz"; - sha256 = "1r68cms5hv8drrdl2zhz8q9hsiln63c1rylbv68dxjz44w5jsw84"; - name = "ktnef-15.08.3.tar.xz"; - }; - }; - ktouch = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktouch-15.08.3.tar.xz"; - sha256 = "07piq43fngk7i5568vqpsd0xhfmfbwm4gwbdgvg0qx5cm2np00pp"; - name = "ktouch-15.08.3.tar.xz"; - }; - }; - ktp-accounts-kcm = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-accounts-kcm-15.08.3.tar.xz"; - sha256 = "04q89vay1936rr94g9n54japqml7b40p8qh2nh8wc13vbiiffbq0"; - name = "ktp-accounts-kcm-15.08.3.tar.xz"; - }; - }; - ktp-approver = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-approver-15.08.3.tar.xz"; - sha256 = "131gb9h8pqa2ac4kv8by5wa5f9cdv32413d2039ggkc0zfhyqlbb"; - name = "ktp-approver-15.08.3.tar.xz"; - }; - }; - ktp-auth-handler = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-auth-handler-15.08.3.tar.xz"; - sha256 = "1k9y83miwy77c2pjm8frm6zbkddm463bkdr08lrl3cf9y0azj6xl"; - name = "ktp-auth-handler-15.08.3.tar.xz"; - }; - }; - ktp-common-internals = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-common-internals-15.08.3.tar.xz"; - sha256 = "1p1qg4nkjmly7iilx6nra0qwn7g6kdwn4hw6bs2ikdvsg36kkr72"; - name = "ktp-common-internals-15.08.3.tar.xz"; - }; - }; - ktp-contact-list = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-list-15.08.3.tar.xz"; - sha256 = "15g7nnz8bggscpba74vk6riizv9xn5ndar1lkay77ikfbbyhb0x6"; - name = "ktp-contact-list-15.08.3.tar.xz"; - }; - }; - ktp-contact-runner = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-runner-15.08.3.tar.xz"; - sha256 = "09angbgm877x81wqsbn7cpg75skiv7x4war1lq1yma6nirs7369p"; - name = "ktp-contact-runner-15.08.3.tar.xz"; - }; - }; - ktp-desktop-applets = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-desktop-applets-15.08.3.tar.xz"; - sha256 = "18x08b38s46pz6crd1qg1b6qy7xxfhhp0pk2hsc5v4s7j931q8v9"; - name = "ktp-desktop-applets-15.08.3.tar.xz"; - }; - }; - ktp-filetransfer-handler = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-filetransfer-handler-15.08.3.tar.xz"; - sha256 = "1w7hnhbjmnl7ba1357b6q440266fgh7kyim9cn919i89aah2d11y"; - name = "ktp-filetransfer-handler-15.08.3.tar.xz"; - }; - }; - ktp-kded-module = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-kded-module-15.08.3.tar.xz"; - sha256 = "0s86d0yad758hgzbd9nb9hpq8iglq8bcmy7wdn0ji2nyppprf0jc"; - name = "ktp-kded-module-15.08.3.tar.xz"; - }; - }; - ktp-send-file = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-send-file-15.08.3.tar.xz"; - sha256 = "15pc0p6f87hwh19kwf6wzd04rf96r2z7xj8h89y86xwirn02spgv"; - name = "ktp-send-file-15.08.3.tar.xz"; - }; - }; - ktp-text-ui = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktp-text-ui-15.08.3.tar.xz"; - sha256 = "04lxwq5cm7rg7xras47lngzn0pwfy6yp41lrybl2ywg9rvbdfv4s"; - name = "ktp-text-ui-15.08.3.tar.xz"; - }; - }; - ktuberling = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktuberling-15.08.3.tar.xz"; - sha256 = "0bs41wlriak2087r1q3zlkblcjl504g1dvhrxx3fymmxgxkir6k6"; - name = "ktuberling-15.08.3.tar.xz"; - }; - }; - kturtle = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kturtle-15.08.3.tar.xz"; - sha256 = "0i4n3k2rji85y0x5aacrpab4jxx5skh3c96yfb9190s6ick3s4jg"; - name = "kturtle-15.08.3.tar.xz"; - }; - }; - ktux = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/ktux-15.08.3.tar.xz"; - sha256 = "0dcida7qjwglra7b17hb15dn240nnbsryps49d9k0fmv7y8cdicd"; - name = "ktux-15.08.3.tar.xz"; - }; - }; - kubrick = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kubrick-15.08.3.tar.xz"; - sha256 = "07bq203ds77v41nqjrydlls25whhpmaqq4wvqqnafz6j3122972m"; - name = "kubrick-15.08.3.tar.xz"; - }; - }; - kuser = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kuser-15.08.3.tar.xz"; - sha256 = "1lhrrrfg0zfkxv87kclfz7lw57knhalfclik9g2g84mjd2mrp23c"; - name = "kuser-15.08.3.tar.xz"; - }; - }; - kwalletmanager = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kwalletmanager-15.08.3.tar.xz"; - sha256 = "1wh4gkqyz003qx50q4m35987rabjh80npg1hiqmybz60syq1bash"; - name = "kwalletmanager-15.08.3.tar.xz"; - }; - }; - kwordquiz = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/kwordquiz-15.08.3.tar.xz"; - sha256 = "1fr68aq6f1ilfvfvcxvjg90dpwsig36nxb5v35rbpg1kjz8lxdl3"; - name = "kwordquiz-15.08.3.tar.xz"; - }; - }; - libkcddb = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkcddb-15.08.3.tar.xz"; - sha256 = "0yspqyj11q4l5b0hmy9068hg7kkbqwy5zq72clbf30lys6h9mqb6"; - name = "libkcddb-15.08.3.tar.xz"; - }; - }; - libkcompactdisc = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkcompactdisc-15.08.3.tar.xz"; - sha256 = "1fvf219dj1dbl69nmdyzvyds9c1f77zqzqwv2l87brk5syshsywp"; - name = "libkcompactdisc-15.08.3.tar.xz"; - }; - }; - libkdcraw = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkdcraw-15.08.3.tar.xz"; - sha256 = "0m1zc23k68gm0hrdl18sizw5qnpa216m03lzik92m50msndz34bc"; - name = "libkdcraw-15.08.3.tar.xz"; - }; - }; - libkdeedu = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkdeedu-15.08.3.tar.xz"; - sha256 = "1z8dp47900ybppnkpbfvckjkiib9q0ggqm0m83vbmgwzanx7k7sn"; - name = "libkdeedu-15.08.3.tar.xz"; - }; - }; - libkdegames = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkdegames-15.08.3.tar.xz"; - sha256 = "1jg6z4qfagijkr1b2hd05sr0jdb0qvfn1dphd43ma6gi7bl5khn4"; - name = "libkdegames-15.08.3.tar.xz"; - }; - }; - libkeduvocdocument = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkeduvocdocument-15.08.3.tar.xz"; - sha256 = "1b16p9m14v8w0qg1v9jwiiljvpc2samlrcp6bszrld02ghii5649"; - name = "libkeduvocdocument-15.08.3.tar.xz"; - }; - }; - libkexiv2 = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkexiv2-15.08.3.tar.xz"; - sha256 = "0q44gjhdjiy74q5a40kmmcry0m0pnzw454j5ynrimd3nk8r2l6nl"; - name = "libkexiv2-15.08.3.tar.xz"; - }; - }; - libkface = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkface-15.08.3.tar.xz"; - sha256 = "0jiv41f1mqf4813m882v84vczkyxmbmjf8bf7d5iq13i9xr190wg"; - name = "libkface-15.08.3.tar.xz"; - }; - }; - libkgeomap = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkgeomap-15.08.3.tar.xz"; - sha256 = "1jscbp31q91viv2ym09zal4c0vx8xx3lqd4vg78mr9591y1bgr7l"; - name = "libkgeomap-15.08.3.tar.xz"; - }; - }; - libkipi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkipi-15.08.3.tar.xz"; - sha256 = "1v70k9xx8va0xk3439sqllh9sl9sx56bayl0b24gkdc3ddj8l0rk"; - name = "libkipi-15.08.3.tar.xz"; - }; - }; - libkmahjongg = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkmahjongg-15.08.3.tar.xz"; - sha256 = "05zff791i1jih5abx6ywfagxh1rwc38nblfcfci66pqvknmya2x1"; - name = "libkmahjongg-15.08.3.tar.xz"; - }; - }; - libkomparediff2 = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libkomparediff2-15.08.3.tar.xz"; - sha256 = "03aaz64s6f3xc6kv188p301qivnjh27xd8jpmj6yq98laj3v2xrl"; - name = "libkomparediff2-15.08.3.tar.xz"; - }; - }; - libksane = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/libksane-15.08.3.tar.xz"; - sha256 = "01x24gxk0xj6j9zwyyavklphykgjb3w0wra61ivyrsim1za8y0qa"; - name = "libksane-15.08.3.tar.xz"; - }; - }; - lokalize = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/lokalize-15.08.3.tar.xz"; - sha256 = "1xzxbgiq5q1v578d9w9pir279n05z2dyqlgq98213zhama6df18z"; - name = "lokalize-15.08.3.tar.xz"; - }; - }; - lskat = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/lskat-15.08.3.tar.xz"; - sha256 = "1kag1wqr5m1r7s3i29h8ls2zrva2whmaxjj400zgn9j404dyjmmd"; - name = "lskat-15.08.3.tar.xz"; - }; - }; - marble = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/marble-15.08.3.tar.xz"; - sha256 = "0i18wss2zq3nfaxr9h7bnj3nb4ib07d3rylphhbjpi766z6k2cbl"; - name = "marble-15.08.3.tar.xz"; - }; - }; - mplayerthumbs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/mplayerthumbs-15.08.3.tar.xz"; - sha256 = "03zda3iy20zq42kn51894yzsbmyq92gvrlzs2hm7fyp5lv199ybm"; - name = "mplayerthumbs-15.08.3.tar.xz"; - }; - }; - okteta = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/okteta-15.08.3.tar.xz"; - sha256 = "11540qlv95iwzmwi17ncbgklakywwdj4r4iylnkpw7fv4sx6fhrd"; - name = "okteta-15.08.3.tar.xz"; - }; - }; - okular = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/okular-15.08.3.tar.xz"; - sha256 = "1inbvcyafa8dfy7kignb2ksc984kriax7n2qrz3rxydw9n0r6bi5"; - name = "okular-15.08.3.tar.xz"; - }; - }; - oxygen-icons = { - version = "15.04.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz"; - sha256 = "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk"; - name = "oxygen-icons-15.04.3.tar.xz"; - }; - }; - palapeli = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/palapeli-15.08.3.tar.xz"; - sha256 = "167svcjz7a8x032585jx63m94jy3xza5zb1b61rchn2xxbar7fx9"; - name = "palapeli-15.08.3.tar.xz"; - }; - }; - parley = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/parley-15.08.3.tar.xz"; - sha256 = "07gshvn8c3ifyzfkscakc1x7kgbzgxcxx12f05n56nm60rbq89w5"; - name = "parley-15.08.3.tar.xz"; - }; - }; - picmi = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/picmi-15.08.3.tar.xz"; - sha256 = "0cjj6xrdacvwpc6v6xb88j31m60k4gimc7k4hlmyv102vvagmv8y"; - name = "picmi-15.08.3.tar.xz"; - }; - }; - poxml = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/poxml-15.08.3.tar.xz"; - sha256 = "0vls7kdqswwx9cnn8iw1iwq9jl861cmzjk2avrdllpsa4vbjfxal"; - name = "poxml-15.08.3.tar.xz"; - }; - }; - print-manager = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/print-manager-15.08.3.tar.xz"; - sha256 = "19jw5xpwhblxfdh1kf6dniwy3pqmqaq7cimdn8zrzliclfjdfq2m"; - name = "print-manager-15.08.3.tar.xz"; - }; - }; - rocs = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/rocs-15.08.3.tar.xz"; - sha256 = "0qb0krn9cw5jn9djf3drg7c28lxnb6ih2a6q9a6wdl7snc4cxp5r"; - name = "rocs-15.08.3.tar.xz"; - }; - }; - signon-kwallet-extension = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/signon-kwallet-extension-15.08.3.tar.xz"; - sha256 = "0h7ixsxd2d9x4lqxilrajaxw260gdpj6lp68qgkq2vfv4v2hnfpv"; - name = "signon-kwallet-extension-15.08.3.tar.xz"; - }; - }; - step = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/step-15.08.3.tar.xz"; - sha256 = "092byp3y91ljp91n1qp3clsgi5bvfp9c8q90y14llkk3693nq6qa"; - name = "step-15.08.3.tar.xz"; - }; - }; - superkaramba = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/superkaramba-15.08.3.tar.xz"; - sha256 = "1z9pz9syqlz180hb0imvabag3cmwfix89811vbz9lqwa91a4i199"; - name = "superkaramba-15.08.3.tar.xz"; - }; - }; - svgpart = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/svgpart-15.08.3.tar.xz"; - sha256 = "0pdj8dlxdws7ccafj4nldi3xwdzsmbyi2c079ddq3pbrglm2r16h"; - name = "svgpart-15.08.3.tar.xz"; - }; - }; - sweeper = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/sweeper-15.08.3.tar.xz"; - sha256 = "0mmhw0d63b3m88x9wv2dynp1xm04f0kkhp6iqnm69y91wdgy7kq5"; - name = "sweeper-15.08.3.tar.xz"; - }; - }; - syndication = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/syndication-15.08.3.tar.xz"; - sha256 = "05hjxpfyqd8z4q0142n5f97qcwpfwr131xxpvsj1pzrqrx52im27"; - name = "syndication-15.08.3.tar.xz"; - }; - }; - umbrello = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/umbrello-15.08.3.tar.xz"; - sha256 = "0pk4xc7sn1b1i1waxngrna33lhs2p03ny0vqm159qfhqawb3fpyg"; - name = "umbrello-15.08.3.tar.xz"; - }; - }; - zeroconf-ioslave = { - version = "15.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.08.3/src/zeroconf-ioslave-15.08.3.tar.xz"; - sha256 = "1vbag0ajhr1b3psg4232j7y0nnff6gdn32r4212ybfzaxnh51479"; - name = "zeroconf-ioslave-15.08.3.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix deleted file mode 100644 index d099e95a16b..00000000000 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons -, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework -, qtdeclarative, shared_mime_info -}: - -plasmaPackage { - name = "bluedevil"; - nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper shared_mime_info - ]; - buildInputs = [ - kcoreaddons kdbusaddons kded kiconthemes knotifications - kwidgetsaddons - ]; - propagatedBuildInputs = [ - bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/bluedevil-wizard" - wrapQtProgram "$out/bin/bluedevil-sendfile" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt4.nix b/pkgs/desktops/plasma-5.4/breeze-qt4.nix deleted file mode 100644 index f8092bc9d37..00000000000 --- a/pkgs/desktops/plasma-5.4/breeze-qt4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ plasmaPackage -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qt4 -, xproto -}: - -plasmaPackage { - name = "breeze-qt4"; - sname = "breeze"; - buildInputs = [ - kdelibs - qt4 - xproto - ]; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; - cmakeFlags = [ - "-DUSE_KDE4=ON" - "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" - ]; -} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix deleted file mode 100644 index f50179ef64c..00000000000 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, frameworkintegration -, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, makeQtWrapper, qtx11extras -}: - -plasmaPackage { - name = "breeze-qt5"; - sname = "breeze"; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - buildInputs = [ - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons - ]; - propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; - cmakeFlags = [ "-DUSE_Qt4=OFF" ]; - postInstall = '' - wrapQtProgram "$out/bin/breeze-settings5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix deleted file mode 100644 index 570134d824f..00000000000 --- a/pkgs/desktops/plasma-5.4/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib stdenv symlinkJoin; - - kf5 = pkgs.kf514; - kdeApps = pkgs.kdeApps_15_08; - - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - mirror = "mirror://kde"; - - plasmaPackage = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - setupHook = args.setupHook or ./setup-hook.sh; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - addPackages = self: with self; { - bluedevil = callPackage ./bluedevil.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze = - let version = (builtins.parseDrvName breeze-qt5.name).version; - in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration.nix {}; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; - kgamma5 = callPackage ./kgamma5.nix {}; - khelpcenter = callPackage ./khelpcenter.nix {}; - khotkeys = callPackage ./khotkeys.nix {}; - kinfocenter = callPackage ./kinfocenter.nix {}; - kmenuedit = callPackage ./kmenuedit.nix {}; - kscreen = callPackage ./kscreen.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = callPackage ./ksysguard.nix {}; - kwayland = callPackage ./kwayland.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - oxygen-fonts = callPackage ./oxygen-fonts.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-mediacenter = callPackage ./plasma-mediacenter.nix {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa.nix {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; - polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; - powerdevil = callPackage ./powerdevil.nix {}; - systemsettings = callPackage ./systemsettings.nix {}; - }; - - newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/desktops/plasma-5.4/fetchsrcs.sh b/pkgs/desktops/plasma-5.4/fetchsrcs.sh deleted file mode 100755 index db2db8f8e56..00000000000 --- a/pkgs/desktops/plasma-5.4/fetchsrcs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/plasma/5.4.3/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <>../srcs.nix <>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix deleted file mode 100644 index 7f19af6959e..00000000000 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig -, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras -}: - -plasmaPackage { - name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcmutils kconfig kdesu kiconthemes - ]; - propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtsvg qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/kmimetypefinder5" - wrapQtProgram "$out/bin/ksvgtopng5" - wrapQtProgram "$out/bin/ktraderclient5" - wrapQtProgram "$out/bin/kioclient5" - wrapQtProgram "$out/bin/kdecp5" - wrapQtProgram "$out/bin/keditfiletype5" - wrapQtProgram "$out/bin/kcmshell5" - wrapQtProgram "$out/bin/kdemv5" - wrapQtProgram "$out/bin/kstart5" - wrapQtProgram "$out/bin/kde-open5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch deleted file mode 100644 index 759eda4cc13..00000000000 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 27 Oct 2015 18:07:54 -0500 -Subject: [PATCH] follow symlinks - ---- - src/appearancegtk2.cpp | 2 +- - src/iconthemesmodel.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp -index b1e0b52..095cddc 100644 ---- a/src/appearancegtk2.cpp -+++ b/src/appearancegtk2.cpp -@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const - QStringList themes=installedThemes(); - themes=themes.filter(QRegExp("/"+themeName+"/?$")); - if(themes.size()==1) { -- QDirIterator it(themes.first(), QDirIterator::Subdirectories); -+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while(it.hasNext()) { - it.next(); - if(it.fileName()=="gtkrc") { -diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp -index 07c7ad7..b04d978 100644 ---- a/src/iconthemesmodel.cpp -+++ b/src/iconthemesmodel.cpp -@@ -46,7 +46,7 @@ QList IconThemesModel::installedThemesPaths() - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix deleted file mode 100644 index 6b41599994d..00000000000 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, glib -, gtk2 -, gtk3 -, karchive -, kcmutils -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knewstuff -}: - -plasmaPackage { - name = "kde-gtk-config"; - patches = [ ./0001-follow-symlinks.patch ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff - ]; - propagatedBuildInputs = [ ki18n kio ]; - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kdecoration.nix b/pkgs/desktops/plasma-5.4/kdecoration.nix deleted file mode 100644 index eb65f7f90af..00000000000 --- a/pkgs/desktops/plasma-5.4/kdecoration.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ plasmaPackage, extra-cmake-modules }: - -plasmaPackage { - name = "kdecoration"; - nativeBuildInputs = [ extra-cmake-modules ]; -} diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix deleted file mode 100644 index d6a96a3276d..00000000000 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig -, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, kunitconversion -, plasma-framework, qtdeclarative, qtx11extras -}: - -plasmaPackage { - name = "kdeplasma-addons"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion - ]; - propagatedBuildInputs = [ - kdelibs4support kio kross krunner plasma-framework qtdeclarative - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kgamma5.nix b/pkgs/desktops/plasma-5.4/kgamma5.nix deleted file mode 100644 index 965c33e6eef..00000000000 --- a/pkgs/desktops/plasma-5.4/kgamma5.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support -, qtx11extras -}: - -plasmaPackage { - name = "kgamma5"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; -} diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix deleted file mode 100644 index 6ba860b9dfb..00000000000 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig -, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support -, khtml, kservice, makeQtWrapper -}: - -plasmaPackage { - name = "khelpcenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kinit kcmutils kservice - ]; - propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/khelpcenter" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix deleted file mode 100644 index 141320e6b3e..00000000000 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils -, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui -, plasma-framework, plasma-workspace, qtx11extras -}: - -plasmaPackage { - name = "khotkeys"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kdbusaddons kxmlgui - ]; - propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework - plasma-workspace qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix deleted file mode 100644 index ed717790cd0..00000000000 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils -, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons -, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper -, pciutils, solid -}: - -plasmaPackage { - name = "kinfocenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kiconthemes kpackage kservice kwidgetsaddons - kxmlgui libraw1394 pciutils solid - ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ]; - postInstall = '' - wrapQtProgram "$out/bin/kinfocenter" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix deleted file mode 100644 index 3834ca1328f..00000000000 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper -}: - -plasmaPackage { - name = "kmenuedit"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kxmlgui kdbusaddons kiconthemes - ]; - propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ]; - postInstall = '' - wrapQtProgram "$out/bin/kmenuedit" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix deleted file mode 100644 index dac7a6ba20a..00000000000 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets -, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, makeQtWrapper, qtdeclarative -}: - -plasmaPackage { - name = "kscreen"; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - buildInputs = [ - kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui - ]; - propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; - propagatedUserEnvPkgs = [ - libkscreen # D-Bus service - ]; - postInstall = '' - wrapQtProgram "$out/bin/kscreen-console" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix deleted file mode 100644 index f274512e027..00000000000 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons, makeQtWrapper -}: - -plasmaPackage { - name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; - propagatedBuildInputs = [ ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/ksshaskpass" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix deleted file mode 100644 index 7af3584989c..00000000000 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig -, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard, makeQtWrapper -}: - -plasmaPackage { - name = "ksysguard"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - ]; - propagatedBuildInputs = [ kdelibs4support ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/ksysguardd" - wrapQtProgram "$out/bin/ksysguard" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kwayland.nix b/pkgs/desktops/plasma-5.4/kwayland.nix deleted file mode 100644 index e4d6eb631f9..00000000000 --- a/pkgs/desktops/plasma-5.4/kwayland.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, wayland -}: - -plasmaPackage { - name = "kwayland"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - wayland - ]; -} diff --git a/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 797a32fc5f8..00000000000 --- a/pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 07:05:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - clients/aurorae/src/aurorae.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 781c960..ad5f420 100644 ---- a/clients/aurorae/src/aurorae.cpp -+++ b/clients/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix deleted file mode 100644 index 2ba35807ff8..00000000000 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy -, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets -, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel -, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications -, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem -, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor -, makeQtWrapper -}: - -plasmaPackage { - name = "kwin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kiconthemes kinit knewstuff knotifications - kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE - libSM qtscript udev wayland xcb-util-cursor - ]; - propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem - plasma-framework qtdeclarative qtmultimedia qtx11extras - ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - wrapQtProgram "$out/bin/kwin_x11" - wrapQtProgram "$out/bin/kwin_wayland" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/kwrited.nix b/pkgs/desktops/plasma-5.4/kwrited.nix deleted file mode 100644 index a6ed9d9bb28..00000000000 --- a/pkgs/desktops/plasma-5.4/kwrited.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty -, knotifications, kdbusaddons -}: - -plasmaPackage { - name = "kwrited"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ]; - propagatedBuildInputs = [ ki18n ]; -} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/default.nix b/pkgs/desktops/plasma-5.4/libkscreen/default.nix deleted file mode 100644 index 9fccbd6834c..00000000000 --- a/pkgs/desktops/plasma-5.4/libkscreen/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, libXrandr -, qtx11extras -}: - -plasmaPackage { - name = "libkscreen"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libXrandr - ]; - propagatedBuildInputs = [ - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch deleted file mode 100644 index d5797924d23..00000000000 --- a/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460022f..422a708 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) - -+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) -+ - set(libkscreen_SRCS - backendloader.cpp - config.cpp -diff --git a/src/backendloader.cpp b/src/backendloader.cpp -index b93e469..8aebc14 100644 ---- a/src/backendloader.cpp -+++ b/src/backendloader.cpp -@@ -16,6 +16,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - *************************************************************************************/ - -+#include "config-libkscreen.h" - #include "backendloader.h" - #include "debug_p.h" - #include "backends/abstractbackend.h" -@@ -40,55 +41,54 @@ bool BackendLoader::init() - const QString backend = qgetenv("KSCREEN_BACKEND").constData(); - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); - -- const QStringList paths = QCoreApplication::libraryPaths(); -- Q_FOREACH (const QString &path, paths) { -- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::NoSort), -- QDir::NoDotAndDotDot | QDir::Files); -- const QFileInfoList finfos = dir.entryInfoList(); -- Q_FOREACH (const QFileInfo &finfo, finfos) { -- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -- continue; -- } -+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); - -- // When on X11, skip the QScreen backend, instead use the XRandR backend, -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -- QX11Info::isPlatformX11()) { -- continue; -- } -+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -+ backendFilter, -+ QDir::SortFlags(QDir::QDir::NoSort), -+ QDir::NoDotAndDotDot | QDir::Files); -+ const QFileInfoList finfos = dir.entryInfoList(); -+ Q_FOREACH (const QFileInfo &finfo, finfos) { -+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -+ continue; -+ } - -- // When not on X11, skip the XRandR backend, and fall back to QSCreen -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -- continue; -- } -+ // When on X11, skip the QScreen backend, instead use the XRandR backend, -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -+ QX11Info::isPlatformX11()) { -+ continue; -+ } -+ -+ // When not on X11, skip the XRandR backend, and fall back to QSCreen -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -+ !QX11Info::isPlatformX11()) { -+ continue; -+ } - -- QPluginLoader loader(finfo.filePath()); -- loader.load(); -- QObject *instance = loader.instance(); -- if (!instance) { -+ QPluginLoader loader(finfo.filePath()); -+ loader.load(); -+ QObject *instance = loader.instance(); -+ if (!instance) { -+ loader.unload(); -+ continue; -+ } -+ -+ s_backend = qobject_cast< AbstractBackend* >(instance); -+ if (s_backend) { -+ if (!s_backend->isValid()) { -+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -+ delete s_backend; -+ s_backend = 0; - loader.unload(); - continue; - } -- -- s_backend = qobject_cast< AbstractBackend* >(instance); -- if (s_backend) { -- if (!s_backend->isValid()) { -- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -- delete s_backend; -- s_backend = 0; -- loader.unload(); -- continue; -- } -- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -- return true; -- } -+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -+ return true; - } - } - -diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake -new file mode 100644 -index 0000000..a99f3d1 ---- /dev/null -+++ b/src/config-libkscreen.h.cmake -@@ -0,0 +1,2 @@ -+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index fbbb11ae755..00000000000 --- a/pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 07:07:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index efed8ff..841761a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { - QStringList scripts; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - scripts.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/libksysguard/default.nix b/pkgs/desktops/plasma-5.4/libksysguard/default.nix deleted file mode 100644 index 373221b2b30..00000000000 --- a/pkgs/desktops/plasma-5.4/libksysguard/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kauth, kcompletion -, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons -, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras -, kconfig, ki18n, kiconthemes -}: - -plasmaPackage { - name = "libksysguard"; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons qtscript qtwebkit - ]; - propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix deleted file mode 100644 index 760de2d79ab..00000000000 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative -, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework -, krunner -}: - -plasmaPackage { - name = "milou"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - qtscript kcoreaddons kservice - ]; - propagatedBuildInputs = [ - kdeclarative ki18n krunner plasma-framework qtdeclarative - ]; -} diff --git a/pkgs/desktops/plasma-5.4/oxygen-fonts.nix b/pkgs/desktops/plasma-5.4/oxygen-fonts.nix deleted file mode 100644 index b1ccb6f5ffd..00000000000 --- a/pkgs/desktops/plasma-5.4/oxygen-fonts.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, fontforge -}: - -plasmaPackage { - name = "oxygen-fonts"; - nativeBuildInputs = [ - extra-cmake-modules - fontforge - ]; -} diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix deleted file mode 100644 index 02918100408..00000000000 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig -, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras -}: - -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper - ]; - buildInputs = [ - kcmutils kconfig kdecoration kguiaddons kwidgetsaddons - kservice kcompletion - ]; - propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch deleted file mode 100644 index a0b1f880ba8..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 28 Aug 2015 10:16:38 -0500 -Subject: [PATCH 1/3] hwclock - ---- - kcms/dateandtime/helper.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index cec5ab8..fc4a6b9 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = KStandardDirs::findExe("hwclock", exePath); -+ QString hwclock = "@hwclock@"; - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << "--systohc"); - } --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch deleted file mode 100644 index 900c4d095e8..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 28 Aug 2015 10:16:53 -0500 -Subject: [PATCH 2/3] zoneinfo - ---- - kcms/dateandtime/helper.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index fc4a6b9..7b64d05 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ // NixOS-specific path -+ QString tz = "/etc/zoneinfo/" + selectedzone; -+ if (!QFile::exists(tz)) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove("/etc/localtime"); --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch deleted file mode 100644 index 6b143bd2eb0..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 19 Oct 2015 18:45:36 -0500 -Subject: [PATCH 3/3] qt-5.5 QML import paths - ---- - applets/pager/package/contents/ui/main.qml | 2 +- - containments/desktop/package/contents/ui/FolderView.qml | 2 +- - containments/desktop/package/contents/ui/main.qml | 2 +- - containments/panel/contents/ui/main.qml | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml -index 0c367c6..c9a82be 100644 ---- a/applets/pager/package/contents/ui/main.qml -+++ b/applets/pager/package/contents/ui/main.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root -diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml -index 578ec87..04e088c 100644 ---- a/containments/desktop/package/contents/ui/FolderView.qml -+++ b/containments/desktop/package/contents/ui/FolderView.qml -@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 - - import org.kde.private.desktopcontainment.folder 0.1 as Folder --import "FolderTools.js" as FolderTools -+import "../code/FolderTools.js" as FolderTools - - Item { - id: main -diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml -index 8c42706..fc74433 100644 ---- a/containments/desktop/package/contents/ui/main.qml -+++ b/containments/desktop/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop - - import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - --import "LayoutManager.js" as LayoutManager -+import "../code/LayoutManager.js" as LayoutManager - - DragDrop.DropArea { - id: root -diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml -index 6a6f364..edba48e 100644 ---- a/containments/panel/contents/ui/main.qml -+++ b/containments/panel/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.kquickcontrolsaddons 2.0 - import org.kde.draganddrop 2.0 as DragDrop - --import "LayoutManager.js" as LayoutManager -+import "../code/LayoutManager.js" as LayoutManager - - DragDrop.DropArea { - id: root --- -2.5.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix deleted file mode 100644 index 6aae2e20aaa..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools -, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils -, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons -, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications -, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev -, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux -, qtquick1, qtquickcontrols -}: - -plasmaPackage rec { - name = "plasma-desktop"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon - qtsvg xf86inputevdev xf86inputsynaptics - xkeyboard_config xinput - ]; - propagatedBuildInputs = [ - baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtquick1 qtquickcontrols - qtx11extras - ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; - patches = [ - (substituteAll { - src = ./0001-hwclock.patch; - hwclock = "${utillinux}/sbin/hwclock"; - }) - ./0002-zoneinfo.patch - ./0003-qt-5.5-QML-import-paths.patch - ]; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; - cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" - "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" - ]; - postInstall = '' - wrapQtProgram "$out/bin/kaccess" - wrapQtProgram "$out/bin/solid-action-desktop-gen" - wrapQtProgram "$out/bin/knetattach" - wrapQtProgram "$out/bin/krdb" - wrapQtProgram "$out/bin/kapplymousetheme" - wrapQtProgram "$out/bin/kfontinst" - wrapQtProgram "$out/bin/kcm-touchpad-list-devices" - wrapQtProgram "$out/bin/kfontview" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix deleted file mode 100644 index afd8a18bbbd..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig -, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice -, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia -, taglib -}: - -plasmaPackage rec { - name = "plasma-mediacenter"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kconfig kcoreaddons kguiaddons kservice - qtdeclarative qtmultimedia taglib - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kfilemetadata ki18n kio - plasma-framework - ]; - # All propagatedBuildInputs should be present in the profile because - # wrappers cannot be used here. - propagatedUserEnvPkgs = propagatedBuildInputs; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch deleted file mode 100644 index 79b5cfb437e..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 25 Oct 2015 09:09:27 -0500 -Subject: [PATCH] mobile-broadband-provider-info path - ---- - libs/editor/mobileproviders.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp -index 568cb34..98a5992 100644 ---- a/libs/editor/mobileproviders.cpp -+++ b/libs/editor/mobileproviders.cpp -@@ -26,7 +26,7 @@ - - #include - --const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; - - bool localeAwareCompare(const QString & one, const QString & two) { - return one.localeAwareCompare(two) < 0; --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-nm/default.nix b/pkgs/desktops/plasma-5.4/plasma-nm/default.nix deleted file mode 100644 index 7e229d58052..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-nm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools -, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews -, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, makeQtWrapper, mobile_broadband_provider_info -, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qtdeclarative, solid -}: - -plasmaPackage { - name = "plasma-nm"; - patches = [ - (substituteAll { - src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; - }) - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons - kxmlgui mobile_broadband_provider_info modemmanager-qt - networkmanager-qt openconnect solid - ]; - propagatedBuildInputs = [ - kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework - qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kde5-nm-connection-editor" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix deleted file mode 100644 index aef6bfeb679..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets -, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio -, plasma-framework -}: - -plasmaPackage { - name = "plasma-pa"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n plasma-framework - ]; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix deleted file mode 100644 index bc87abcad15..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -}: - -plasmaPackage { - name = "plasma-workspace-wallpapers"; - nativeBuildInputs = [ - extra-cmake-modules - ]; -} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch deleted file mode 100644 index f66cb618927..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch +++ /dev/null @@ -1,401 +0,0 @@ -From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Thu, 27 Aug 2015 20:36:39 -0500 -Subject: [PATCH 1/2] startkde NixOS patches - ---- - startkde/startkde.cmake | 217 ++++++++++++++++++++---------------------------- - 1 file changed, 88 insertions(+), 129 deletions(-) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 2c4c315..7733721 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -1,8 +1,31 @@ --#!/bin/sh -+#!@bash@/bin/bash - # - # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+set -x -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $HOME/.config/Trolltech.conf ]; then -+ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -+fi -+ - if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing -@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`qtpaths --binaries-dir` -- qdbus=$qbindir/qdbus -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --else -- qdbus=qdbus --fi -- - # Check if a KDE session already is running and whether it's possible to connect to X --kcheckrunning -+@out@/bin/kcheckrunning - kcheckrunning_result=$? - if test $kcheckrunning_result -eq 0 ; then -- echo "KDE seems to be already running on this display." -- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null -+ echo "KDE seems to be already running on this display." -+ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." - exit 1 - elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+ exit 1 - fi - - # Boot sequence: -@@ -56,13 +66,8 @@ fi - # * Then ksmserver is started which takes control of the rest of the startup sequence - - # We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html --fi -- --mkdir -p $configDir -+configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation) -+mkdir -p "$configDir" - - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys </dev/null 2>/dev/null; then -+ : # ok -+else -+ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -+ exit 1 -+fi -+ - ksplash_pid= - if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) -- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` -+ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; -@@ -200,8 +189,7 @@ fi - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -@@ -231,7 +219,7 @@ usr_odir=$HOME/.fonts/kde-override - usr_fdir=$HOME/.fonts - - if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -+ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts - else -@@ -244,23 +232,13 @@ fi - # add the user's dirs to the font path, as they might simply have been made - # read-only by the administrator, for whatever reason. - --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" -+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) -+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) -+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" - - # Ask X11 to rebuild its font list. --xset fp rehash -- --# Set a left cursor instead of the standard X11 "X" cursor, since I've heard --# from some users that they're confused and don't know what to do. This is --# especially necessary on slow machines, where starting KDE takes one or two --# minutes until anything appears on the screen. --# --# If the user has overwritten fonts, the cursor font may be different now --# so don't move this up. --# --xsetroot -cursor_name left_ptr -+@xset@/bin/xset fp rehash - - # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap - if test -n "$GS_LIB" ; then -@@ -273,30 +251,6 @@ fi - - echo 'startkde: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then -- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- --# Make sure that D-Bus is running --# D-Bus autolaunch is broken --if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -- eval `dbus-launch --sh-syntax --exit-with-session` --fi --if $qdbus >/dev/null 2>/dev/null; then -- : # ok --else -- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 -- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" -- exit 1 --fi -- -- - # Mark that full KDE session is running (e.g. Konqueror preloading works only - # with full KDE running). The KDE_FULL_SESSION property can be detected by - # any X client connected to the same X session, even if not launched -@@ -321,11 +275,11 @@ fi - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - KDE_SESSION_UID=`id -ru` - export KDE_SESSION_UID -@@ -335,11 +289,11 @@ export XDG_CURRENT_DESKTOP - - # At this point all the environment is ready, let's send it to kwalletd if running - if test -n "$PAM_KWALLET_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN - fi - # ...and also to kwalletd5 - if test -n "$PAM_KWALLET5_LOGIN" ; then -- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN -+ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN - fi - - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@@ -348,21 +302,26 @@ if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - -+# (NixOS) We run kbuildsycoca5 before starting the user session because things -+# may be missing or moved if they have run nixos-rebuild and it may not be -+# possible for them to start Konsole to run it manually! -+@kservice@/bin/kbuildsycoca5 -+ - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence - # if the KDEWM environment variable has been set, then it will be used as KDE's -@@ -378,27 +337,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" - test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS -+@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." -+ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` - - if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- $qdbus "$address" "/MainApplication" "quit" -+ @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do -+ @qttools@/bin/qdbus "$address" "/MainApplication" "quit" - done - break - fi -@@ -410,21 +369,21 @@ echo 'startkde: Shutting down...' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - - # Clean up --kdeinit5_shutdown -+@kinit@/bin/kdeinit5_shutdown - - echo 'startkde: Running shutdown scripts...' 1>&2 - - # Run scripts found in /plasma-workspace/shutdown - for prefix in `echo "$scriptpath"`; do -- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do -+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" - done - done - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch deleted file mode 100644 index 7614a2add9d..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 19 Oct 2015 18:55:36 -0500 -Subject: [PATCH 2/2] qt-5.5 QML import paths - ---- - applets/analog-clock/contents/ui/analogclock.qml | 2 +- - applets/batterymonitor/package/contents/ui/BatteryItem.qml | 2 +- - applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +- - applets/batterymonitor/package/contents/ui/PopupDialog.qml | 2 +- - applets/batterymonitor/package/contents/ui/batterymonitor.qml | 2 +- - applets/lock_logout/contents/ui/lockout.qml | 2 +- - applets/notifications/package/contents/ui/main.qml | 2 +- - applets/systemtray/package/contents/ui/main.qml | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml -index edb3af9..7eb839d 100644 ---- a/applets/analog-clock/contents/ui/analogclock.qml -+++ b/applets/analog-clock/contents/ui/analogclock.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar - import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock -diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -index 8d43797..3322369 100644 ---- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml -@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.plasma.workspace.components 2.0 - import org.kde.kcoreaddons 1.0 as KCoreAddons --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batteryItem -diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -index b4059cb..ae8eeaf 100755 ---- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -index d4952c6..2b6586d 100644 ---- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog -diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -index a086581..6e1e8be 100755 ---- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.kcoreaddons 1.0 as KCoreAddons - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: batterymonitor -diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index d243796..86475df 100644 ---- a/applets/lock_logout/contents/ui/lockout.qml -+++ b/applets/lock_logout/contents/ui/lockout.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 - import org.kde.kquickcontrolsaddons 2.0 --import "data.js" as Data -+import "../code/data.js" as Data - - Flow { - id: lockout -diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml -index 2871cdb..3f50856 100644 ---- a/applets/notifications/package/contents/ui/main.qml -+++ b/applets/notifications/package/contents/ui/main.qml -@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.plasma.private.notifications 1.0 - --import "uiproperties.js" as UiProperties -+import "../code/uiproperties.js" as UiProperties - - MouseEventListener { - id: notificationsApplet -diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml -index 2e26455..864c9c5 100644 ---- a/applets/systemtray/package/contents/ui/main.qml -+++ b/applets/systemtray/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore - // import org.kde.plasma.extras 2.0 as PlasmaExtras - - import org.kde.private.systemtray 2.0 as SystemTray --import "Layout.js" as LayoutManager -+import "../code/Layout.js" as LayoutManager - - Item { - id: root --- -2.6.2 - diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix deleted file mode 100644 index 85f38b24e8c..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, baloo -, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative -, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime -, kjsembed, knewstuff, knotifyconfig, kpackage, krunner -, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient -, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt -, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland -, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage -, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols -}: - -plasmaPackage rec { - name = "plasma-workspace"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff - knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libSM libXcursor networkmanager-qt pam phonon - qtscript wayland - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor kwin libkscreen libksysguard - plasma-framework qtquick1 qtquickcontrols qtx11extras solid - ]; - patches = [ - ./0001-startkde-NixOS-patches.patch - ./0002-qt-5.5-QML-import-paths.patch - ]; - - inherit bash coreutils gnused gnugrep socat; - inherit kconfig kinit kservice qttools; - inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot; - postPatch = '' - substituteAllInPlace startkde/startkde.cmake - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 - ''; - postInstall = '' - wrapQtProgram "$out/bin/ksmserver" - wrapQtProgram "$out/bin/plasmawindowed" - wrapQtProgram "$out/bin/kcminit_startup" - wrapQtProgram "$out/bin/ksplashqml" - wrapQtProgram "$out/bin/kcheckrunning" - wrapQtProgram "$out/bin/systemmonitor" - wrapQtProgram "$out/bin/kstartupconfig5" - wrapQtProgram "$out/bin/startplasmacompositor" - wrapQtProgram "$out/bin/kdostartupconfig5" - wrapQtProgram "$out/bin/klipper" - wrapQtProgram "$out/bin/kuiserver5" - wrapQtProgram "$out/bin/krunner" - wrapQtProgram "$out/bin/plasmashell" - - wrapQtProgram "$out/lib/libexec/drkonqi" - wrapQtProgram "$out/lib/libexec/kscreenlocker_greet" - rm "$out/lib/libexec/startplasma" - ''; -} diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix deleted file mode 100644 index 0173ec65516..00000000000 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ plasmaPackage -, extra-cmake-modules -, ki18n -, kwindowsystem -, kdbusaddons -, kwidgetsaddons -, kcoreaddons -, kcrash -, kconfig -, kiconthemes -, knotifications -, polkitQt -}: - -plasmaPackage { - name = "polkit-kde-agent"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdbusaddons - kwidgetsaddons - kcoreaddons - kcrash - kconfig - kiconthemes - knotifications - polkitQt - ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; -} diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix deleted file mode 100644 index 4b57a2e0a79..00000000000 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities -, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n -, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace -, qtx11extras, solid, udev -}: - -plasmaPackage { - name = "powerdevil"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev - ]; - propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - libkscreen plasma-workspace qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5.4/setup-hook.sh b/pkgs/desktops/plasma-5.4/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/desktops/plasma-5.4/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/plasma-5.4/srcs.nix b/pkgs/desktops/plasma-5.4/srcs.nix deleted file mode 100644 index b60a1b2ccd8..00000000000 --- a/pkgs/desktops/plasma-5.4/srcs.nix +++ /dev/null @@ -1,301 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - bluedevil = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/bluedevil-5.4.3.tar.xz"; - sha256 = "04zl8sl59imxfmph8igy2xw5qbdqhqbf1f3s92zhrcqghnawyr3k"; - name = "bluedevil-5.4.3.tar.xz"; - }; - }; - breeze = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/breeze-5.4.3.tar.xz"; - sha256 = "1ylkrza65m4irvyfl3nzfsfaf3j0z3q5j5qv7lk16g4crknxb2gw"; - name = "breeze-5.4.3.tar.xz"; - }; - }; - kde-cli-tools = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kde-cli-tools-5.4.3.tar.xz"; - sha256 = "16d7fkxvbr60h96g7faq6c7gzssb43ynac7yhpfp4i2gwx1w9q8r"; - name = "kde-cli-tools-5.4.3.tar.xz"; - }; - }; - kdecoration = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kdecoration-5.4.3.tar.xz"; - sha256 = "1m92spmq0gadcwgwhnf163kh3kzccgw2b62px1v5krk8hlw6q19q"; - name = "kdecoration-5.4.3.tar.xz"; - }; - }; - kde-gtk-config = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kde-gtk-config-5.4.3.tar.xz"; - sha256 = "0apfvcmwzp5g02kx0dvkywrfb7v9gbmlnmyga2jra027zf61jf98"; - name = "kde-gtk-config-5.4.3.tar.xz"; - }; - }; - kdeplasma-addons = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz"; - sha256 = "0wyqwrlhm9k2wscbw372mk2v7207jappq59jhzxx223glvz2qrxp"; - name = "kdeplasma-addons-5.4.3.tar.xz"; - }; - }; - kgamma5 = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kgamma5-5.4.3.tar.xz"; - sha256 = "0l6bk008w8m3wiqvk4pdw9s7iln9fbkbi5xl3b8rf846knr478gr"; - name = "kgamma5-5.4.3.tar.xz"; - }; - }; - khelpcenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/khelpcenter-5.4.3.tar.xz"; - sha256 = "0kf68maqcm2ym62d6r7v6sw9v91qxzdg53l0hk9h6p7sycs0jqq2"; - name = "khelpcenter-5.4.3.tar.xz"; - }; - }; - khotkeys = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/khotkeys-5.4.3.tar.xz"; - sha256 = "094nsrmnja83rim1cxa5p4rfxx4bdwwsv6b04rvg0l55jvw9wp29"; - name = "khotkeys-5.4.3.tar.xz"; - }; - }; - kinfocenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kinfocenter-5.4.3.tar.xz"; - sha256 = "1v6y1div8fhyn93ypnz3a7q6d1mzyabav2bq4rn5rg5hldizjns7"; - name = "kinfocenter-5.4.3.tar.xz"; - }; - }; - kmenuedit = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kmenuedit-5.4.3.tar.xz"; - sha256 = "0zpwvg0xw04jg5kxv9kdmlf6pg1yp6ibzafl8q3ah8ca5n92gb9n"; - name = "kmenuedit-5.4.3.tar.xz"; - }; - }; - kscreen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kscreen-5.4.3.tar.xz"; - sha256 = "01ba4qqf5vlmsgpf3raq7dgwxvdcm4inc7v03b3z4l7980wa6nxr"; - name = "kscreen-5.4.3.tar.xz"; - }; - }; - ksshaskpass = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/ksshaskpass-5.4.3.tar.xz"; - sha256 = "18r7a49i0rlijjz02h2k2wri3bkhjvzl5as0nv55gkg8b1g05dky"; - name = "ksshaskpass-5.4.3.tar.xz"; - }; - }; - ksysguard = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/ksysguard-5.4.3.tar.xz"; - sha256 = "1lgbvabxfzyl9x1nsmr6nifh24jxnvlknigfrzfcnryibbvk6mlk"; - name = "ksysguard-5.4.3.tar.xz"; - }; - }; - kwallet-pam = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz"; - sha256 = "0m5yz8c6alaw0rkc0dd9cp7jijqmpdmqg4qbc3i3pp5rz3hiyp51"; - name = "kwallet-pam-5.4.3.tar.xz"; - }; - }; - kwayland = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwayland-5.4.3.tar.xz"; - sha256 = "026jgwyvkfb3zdrama2fi046zxg7v3khvb6sxl1krj4idiiyz1c0"; - name = "kwayland-5.4.3.tar.xz"; - }; - }; - kwayland-integration = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwayland-integration-5.4.3.tar.xz"; - sha256 = "10acnrv7m12gwd0mccp9j9a47sjl29xrrfwlpqiqh9hcw4vn7mqp"; - name = "kwayland-integration-5.4.3.tar.xz"; - }; - }; - kwin = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwin-5.4.3.tar.xz"; - sha256 = "0rn359b31hpwqarsw3018r1j7vaavwwxpnnhy29ixsdybmrl4j5b"; - name = "kwin-5.4.3.tar.xz"; - }; - }; - kwrited = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/kwrited-5.4.3.tar.xz"; - sha256 = "0irnhvsz6zssq3yb7lf0qy0qimydg78y1ghakpmry8632xgmr0yk"; - name = "kwrited-5.4.3.tar.xz"; - }; - }; - libkscreen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/libkscreen-5.4.3.tar.xz"; - sha256 = "0xa9g6kvvxn2q3fv0217dk3j4dgbd0mhy8hgrvblpp0fw721faqx"; - name = "libkscreen-5.4.3.tar.xz"; - }; - }; - libksysguard = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/libksysguard-5.4.3.tar.xz"; - sha256 = "18fndkj2bzbwrbixrsq27x4ar379vlsplr3nw766maw31nv5in6i"; - name = "libksysguard-5.4.3.tar.xz"; - }; - }; - milou = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/milou-5.4.3.tar.xz"; - sha256 = "0xy6h1h1ws47rqx5hcn3916xwf49nywwmq32161jap233347yj71"; - name = "milou-5.4.3.tar.xz"; - }; - }; - muon = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/muon-5.4.3.tar.xz"; - sha256 = "011l36ayl0xhap5d7cmkbf4vki8516r594dhxdpfm0ma0rnz4xrl"; - name = "muon-5.4.3.tar.xz"; - }; - }; - oxygen = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/oxygen-5.4.3.tar.xz"; - sha256 = "1av665s2gq84y925qqfhc5bi7wm17vm7p4n10kigsnn5ywylh405"; - name = "oxygen-5.4.3.tar.xz"; - }; - }; - oxygen-fonts = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz"; - sha256 = "13430yajk1i2l9lz95ry9xc1fvzpvfvdp6m9jikb2g55x606abx0"; - name = "oxygen-fonts-5.4.3.tar.xz"; - }; - }; - plasma-desktop = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-desktop-5.4.3.tar.xz"; - sha256 = "0hy08ip6cvcz2s3w1wkqjxdydmmfj5mcqv85qbawsrkix0d79694"; - name = "plasma-desktop-5.4.3.tar.xz"; - }; - }; - plasma-mediacenter = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-mediacenter-5.4.3.tar.xz"; - sha256 = "0k85h93yxqf9ccw620r8wk38gzd8nmpmaxsvwx2rssgnn35f04va"; - name = "plasma-mediacenter-5.4.3.tar.xz"; - }; - }; - plasma-nm = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-nm-5.4.3.tar.xz"; - sha256 = "1wlhzhn7sz26b0ibvwrxbp4pwajvnpj6m37md9bdls3872yhql5r"; - name = "plasma-nm-5.4.3.tar.xz"; - }; - }; - plasma-pa = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-pa-5.4.3.tar.xz"; - sha256 = "16ydbvvpwrnh0ik005gdpvmbn38a1k0bn8zvas1gwjz86rkayxr6"; - name = "plasma-pa-5.4.3.tar.xz"; - }; - }; - plasma-sdk = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-sdk-5.4.3.tar.xz"; - sha256 = "08d31g0364ifc5yix0617zhjyv1skrc9m6x38mx0jjk1z2ng9db8"; - name = "plasma-sdk-5.4.3.tar.xz"; - }; - }; - plasma-workspace = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz"; - sha256 = "030xqy1s8j3h03arjc39xhw2xs9h2c328id6qgaqxk8v9qimkr5z"; - name = "plasma-workspace-5.4.3.tar.xz"; - }; - }; - plasma-workspace-wallpapers = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-wallpapers-5.4.3.tar.xz"; - sha256 = "12yb9d2b7ynfkmmcc4ciz8cnx482vn9545qrijaa403ba0jfbrhx"; - name = "plasma-workspace-wallpapers-5.4.3.tar.xz"; - }; - }; - polkit-kde-agent = { - version = "1-5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/polkit-kde-agent-1-5.4.3.tar.xz"; - sha256 = "1309wmdrxfqlv621kagwycn2s41n9zsyb56ysqmyilhnb7wq59yn"; - name = "polkit-kde-agent-1-5.4.3.tar.xz"; - }; - }; - powerdevil = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/powerdevil-5.4.3.tar.xz"; - sha256 = "1j20xgca41hqacgsridsigw7s275ad3j0khb59875722qz1y91a0"; - name = "powerdevil-5.4.3.tar.xz"; - }; - }; - sddm-kcm = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/sddm-kcm-5.4.3.tar.xz"; - sha256 = "1ppryl541pjwxi73q1qdcd23kmhga3ajj0j6fws6y8ag4mpg2b6k"; - name = "sddm-kcm-5.4.3.tar.xz"; - }; - }; - systemsettings = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/systemsettings-5.4.3.tar.xz"; - sha256 = "04p455rfxlsp817dqgg907szyfsd0f6ym5kaqaj2g7ys5v8id1vb"; - name = "systemsettings-5.4.3.tar.xz"; - }; - }; - user-manager = { - version = "5.4.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.4.3/user-manager-5.4.3.tar.xz"; - sha256 = "0vnfh5q8fgjs40frsb709r7d0py1xgr40air3zysasw25g4bjca8"; - name = "user-manager-5.4.3.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix deleted file mode 100644 index a921e153dbc..00000000000 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews -, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper -}: - -plasmaPackage { - name = "systemsettings"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons - kconfig - ]; - propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; - postInstall = '' - wrapQtProgram "$out/bin/systemsettings5" - ''; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/attica.nix b/pkgs/development/libraries/kde-frameworks-5.15/attica.nix deleted file mode 100644 index 98721876c12..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix deleted file mode 100644 index 38c41d9271d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig -, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid -}: - -kdeFramework { - name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kconfig kcrash kdbusaddons lmdb qtquick1 solid - ]; - propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase - ]; - postInstall = '' - wrapQtProgram "$out/bin/baloo_file" - wrapQtProgram "$out/bin/baloo_file_extractor" - wrapQtProgram "$out/bin/balooctl" - wrapQtProgram "$out/bin/baloosearch" - wrapQtProgram "$out/bin/balooshow" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix deleted file mode 100644 index f981b0516f7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtdeclarative -}: - -kdeFramework { - name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix deleted file mode 100644 index 6b6b95ab3c7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib makeSetupHook stdenv; - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - addPackages = self: with self; { - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata.nix {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - plasma-framework = callPackage ./plasma-framework {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; - }; - - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix deleted file mode 100644 index 4e1b1aff3bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - patches = [ ./0001-extra-cmake-modules-paths.patch ]; - - setupHook = ./setup-hook.sh; - - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = { - license = stdenv.lib.licenses.bsd2; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index a6fa6189240..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,27 +0,0 @@ -addMimePkg() { - local propagated - - if [[ -d "$1/share/mime" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - fi -} - -envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh deleted file mode 100755 index e7f6d9e00e5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.15/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -rm -f ../srcs.csv - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -find . | while read src; do - if [[ -f "${src}" ]]; then - # Sanitize file name - filename=$(basename "$src" | tr '@' '_') - nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') - version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>../srcs.csv - fi -done - -cat >../srcs.nix <>../srcs.nix <>../srcs.nix - -rm -f ../srcs.csv - -cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix deleted file mode 100644 index 26987c385ad..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion -, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, libXcursor, qtx11extras -}: - -kdeFramework { - name = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kbookmarks kcompletion kconfig knotifications kwidgetsaddons - libXcursor - ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix deleted file mode 100644 index 3225098f439..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig -, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative -}: - -kdeFramework { - name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kxmlgui - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kactivitymanagerd" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix deleted file mode 100644 index 647be8f052c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix deleted file mode 100644 index a8d9a0003c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix deleted file mode 100644 index 42a10019334..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, polkitQt -}: - -kdeFramework { - name = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./kauth-policy-install.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix deleted file mode 100644 index 1a469ab4db6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui -}: - -kdeFramework { - name = "kbookmarks"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 0d861fa9501..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:43:53 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 9c3431d..d6b1ee2 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix deleted file mode 100644 index dbbb783ac61..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets -, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews -, kpackage, kservice, kxmlgui -}: - -kdeFramework { - name = "kcmutils"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kiconthemes kitemviews kpackage kxmlgui - ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix deleted file mode 100644 index 53a69a69b69..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix deleted file mode 100644 index e393774f16a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: - -kdeFramework { - name = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix deleted file mode 100644 index e132afe5988..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -}: - -kdeFramework { - name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kreadconfig5" - wrapQtProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a6c0ee9053..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:47:01 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix deleted file mode 100644 index 0e14d06edd3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper -}: - -kdeFramework { - name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kguiaddons ]; - propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - wrapQtProgram "$out/bin/preparetips5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix deleted file mode 100644 index 43c21bb51ef..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, shared_mime_info -}: - -kdeFramework { - name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ shared_mime_info ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix deleted file mode 100644 index bbab78ccb40..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix deleted file mode 100644 index d2ceab31d14..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - propagatedBuildInputs = [ qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix deleted file mode 100644 index 74d107466cf..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig -, qtdeclarative -}: - -kdeFramework { - name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons - ]; - propagatedBuildInputs = [ - kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kpackagelauncherqml" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kded.nix b/pkgs/development/libraries/kde-frameworks-5.15/kded.nix deleted file mode 100644 index 47ae2d68c68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kded.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix deleted file mode 100644 index 0dd5c415761..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs -}: - -# TODO: debug docbook detection - -kdeFramework { - name = "kdelibs4support"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; - propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix deleted file mode 100644 index 28df2415320..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdewebkit -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet -}: - -kdeFramework { - name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui - ]; - propagatedBuildInputs = [ kio sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix deleted file mode 100644 index 364fbd6a720..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty -, kservice -}: - -kdeFramework { - name = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kservice ]; - propagatedBuildInputs = [ ki18n kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix deleted file mode 100644 index d361313d1d4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit -}: - -kdeFramework { - name = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n kio qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix deleted file mode 100644 index f00432b0c9c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, avahi -}: - -kdeFramework { - name = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix deleted file mode 100644 index 138c3fc33b9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages -}: - -kdeFramework { - name = "kdoctools"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ]; - propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh deleted file mode 100644 index 5cfffbd622d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addXdgData() { - addToSearchPath XDG_DATA_DIRS "$1/share" -} - -envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix deleted file mode 100644 index d165f84e3a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice -}: - -kdeFramework { - name = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix deleted file mode 100644 index 92ca1f26b93..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix deleted file mode 100644 index c535b3590a3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kglobalaccel5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix deleted file mode 100644 index bc4e9ab1184..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kguiaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix deleted file mode 100644 index d40df466ebb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive -, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs -, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet -}: - -kdeFramework { - name = "khtml"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kxmlgui phonon - ]; - propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets - kwindowsystem qtx11extras sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix deleted file mode 100644 index 915e3294b46..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtscript -}: - -kdeFramework { - name = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; - propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix deleted file mode 100644 index 02b516afedc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n -, kitemviews, qtsvg -}: - -kdeFramework { - name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix deleted file mode 100644 index fc086560023..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras -}: - -kdeFramework { - name = "kidletime"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix deleted file mode 100644 index 49d66bbcc2c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ilmbase -}: - -kdeFramework { - name = "kimageformats"; - nativeBuildInputs = [ extra-cmake-modules ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix deleted file mode 100644 index 5f644d7c424..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash -, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap -, libcap_progs -}: - -# TODO: setuid wrapper - -kdeFramework { - name = "kinit"; - nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice libcap ]; - propagatedBuildInputs = [ ki18n kio kwindowsystem ]; - patches = [ ./0001-kinit-libpath.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix deleted file mode 100644 index 0789828d812..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, acl, karchive -, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews -, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper -, qtscript, qtx11extras, solid -}: - -kdeFramework { - name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons - qtscript - ]; - propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kwindowsystem kxmlgui solid qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/kcookiejar5" - wrapQtProgram "$out/bin/ktelnetservice5" - wrapQtProgram "$out/bin/ktrash5" - wrapQtProgram "$out/bin/kmailservice5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix deleted file mode 100644 index a9024d771cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix deleted file mode 100644 index 931019ce495..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix deleted file mode 100644 index 746edf12eea..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qtx11extras -}: - -kdeFramework { - name = "kjobwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons ]; - propagatedBuildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix deleted file mode 100644 index 768720f178c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -}: - -kdeFramework { - name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kjs5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix deleted file mode 100644 index 22eef2d47bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, makeQtWrapper, qtsvg -}: - -kdeFramework { - name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ qtsvg ]; - propagatedBuildInputs = [ ki18n kjs ]; - postInstall = '' - wrapQtProgram "$out/bin/kjscmd5" - wrapQtProgram "$out/bin/kjsconsole" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix deleted file mode 100644 index 460458b2232..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kparts -, kxmlgui -}: - -kdeFramework { - name = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix deleted file mode 100644 index 5bcd6f30146..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive -, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio -, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui -}: - -kdeFramework { - name = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kcompletion kconfig kcoreaddons kiconthemes - kitemviews ktextwidgets kwidgetsaddons - ]; - propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix deleted file mode 100644 index 7e301dd0f26..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons phonon - ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix deleted file mode 100644 index dd99d2d4f1e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, ki18n, kio, phonon -}: - -kdeFramework { - name = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig phonon ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH 1/2] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:50:28 -0500 -Subject: [PATCH 2/2] qdiriterator follow symlinks - ---- - src/kpackage/packageloader.cpp | 2 +- - src/kpackage/private/packagejobthread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp -index eb5ed47..94217f6 100644 ---- a/src/kpackage/packageloader.cpp -+++ b/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index ca523b3..1cfa792 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) - QJsonArray plugins; - - int i = 0; -- QDirIterator it(dir, QStringList()< -Date: Wed, 14 Oct 2015 06:28:57 -0500 -Subject: [PATCH 1/2] qdiriterator follow symlinks - ---- - src/sycoca/kbuildsycoca.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp -index 1deae14..250baa8 100644 ---- a/src/sycoca/kbuildsycoca.cpp -+++ b/src/sycoca/kbuildsycoca.cpp -@@ -208,7 +208,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch deleted file mode 100644 index 685c6852611..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:31:29 -0500 -Subject: [PATCH 2/2] no canonicalize path - ---- - src/sycoca/vfolder_menu.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp -index d3e31c3..d15d743 100644 ---- a/src/sycoca/vfolder_menu.cpp -+++ b/src/sycoca/vfolder_menu.cpp -@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix deleted file mode 100644 index 03b7c7c2f51..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - propagatedUserEnvPkgs = [ kcoreaddons ]; - patches = [ - ./0001-qdiriterator-follow-symlinks.patch - ./0002-no-canonicalize-path.patch - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh deleted file mode 100644 index c28e862ff8a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh +++ /dev/null @@ -1,43 +0,0 @@ -addServicePkg() { - local propagated - for dir in "share/kservices5" "share/kservicetypes5"; do - if [[ -d "$1/$dir" ]]; then - propagated= - for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs $1" - fi - - propagated= - for pkg in $propagatedUserEnvPkgs; do - if [[ "z$pkg" == "z$1" ]]; then - propagated=1 - break - fi - done - if [[ -z $propagated ]]; then - propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" - fi - - break - fi - done -} - -envHooks+=(addServicePkg) - -local propagated -for pkg in $propagatedBuildInputs; do - if [[ "z$pkg" == "z@out@" ]]; then - propagated=1 - break - fi -done -if [[ -z $propagated ]]; then - propagatedBuildInputs="$propagatedBuildInputs @out@" -fi diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index def55bff9b2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 09:08:59 -0500 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3c63140..e3d5efe 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix deleted file mode 100644 index 39092fbb278..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig -, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript -, qtxmlpatterns, sonnet -}: - -kdeFramework { - name = "ktexteditor"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts qtscript - qtxmlpatterns - ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; - patches = [ ./0001-no-qcoreapplication.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix deleted file mode 100644 index e332d4ff9a8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig -, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem -, sonnet -}: - -kdeFramework { - name = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice - ]; - propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix deleted file mode 100644 index 3cf0f847d83..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: - -kdeFramework { - name = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix deleted file mode 100644 index 7c4177e009d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper -}: - -kdeFramework { - name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kiconthemes knotifications - kservice kwidgetsaddons libgcrypt - ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; - postInstall = '' - wrapQtProgram "$out/bin/kwalletd5" - wrapQtProgram "$out/bin/kwallet-query" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix deleted file mode 100644 index d95f44d3fec..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix deleted file mode 100644 index 09ab1f2200d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix deleted file mode 100644 index b3b8b39932d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig -, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews -, ktextwidgets, kwindowsystem, sonnet -}: - -kdeFramework { - name = "kxmlgui"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - attica kconfig kconfigwidgets kiconthemes kitemviews - ktextwidgets - ]; - propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix deleted file mode 100644 index 20a300b68bc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: - -kdeFramework { - name = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix deleted file mode 100644 index 7d7f769d6a9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager -}: - -kdeFramework { - name = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix deleted file mode 100644 index 333378bd143..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, networkmanager -}: - -kdeFramework { - name = "networkmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix deleted file mode 100644 index d8846f77723..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio -, knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, makeQtWrapper, qtscript, qtx11extras -}: - -kdeFramework { - name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kxmlgui qtscript - ]; - propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem - qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/plasmapkg2" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix deleted file mode 100644 index afd125e3c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtdeclarative -}: - -kdeFramework { - name = "solid"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ qtdeclarative ]; - postInstall = '' - wrapQtProgram "$out/bin/solid-hardware5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix deleted file mode 100644 index 943fe04a1c9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, hunspell -}: - -kdeFramework { - name = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix deleted file mode 100644 index fd4998c49ba..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix +++ /dev/null @@ -1,549 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/attica-5.15.0.tar.xz"; - sha256 = "0gddapcl2m5gds8f341z0954qlllx22xbd51649lri429aw2ijcl"; - name = "attica-5.15.0.tar.xz"; - }; - }; - baloo = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/baloo-5.15.0.tar.xz"; - sha256 = "10qwxljzhl8wagfmvdbrmqlzk68jkrp703d232fr7gvz3qrmdpbz"; - name = "baloo-5.15.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/bluez-qt-5.15.0.tar.xz"; - sha256 = "15k242ifj3mfy0g0v7h504zn07cvahc70whc6n9yr0091j1azf5f"; - name = "bluez-qt-5.15.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/extra-cmake-modules-5.15.0.tar.xz"; - sha256 = "1g02dcbx1r0n2skrhmc6d3pckqvbii7ai91chlkwcdd8vzd4lgcg"; - name = "extra-cmake-modules-5.15.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz"; - sha256 = "06sacinx3g3hrs11v67k7j8ddp5swasjrw6x36ng3mr81i2ksyia"; - name = "frameworkintegration-5.15.0.tar.xz"; - }; - }; - kactivities = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kactivities-5.15.0.tar.xz"; - sha256 = "0h9f78f8r5z5jarxph168h1m0zvz2zhd8iq6gc9sg09044xn1lnq"; - name = "kactivities-5.15.0.tar.xz"; - }; - }; - kapidox = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kapidox-5.15.0.tar.xz"; - sha256 = "1342j7459rafz1ns0nnlh1i65c05cd6l3c4sh1j75qgl0pjnrvcq"; - name = "kapidox-5.15.0.tar.xz"; - }; - }; - karchive = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/karchive-5.15.0.tar.xz"; - sha256 = "1s5mggi0vydg9w589qk4fp4qbhj7h9wcczn6k7j41bcqdapxzdfh"; - name = "karchive-5.15.0.tar.xz"; - }; - }; - kauth = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kauth-5.15.0.tar.xz"; - sha256 = "1nhrfbfasmg8a9gj94ri5qcvrdhhb204miv3i5y59ma09hd1xag2"; - name = "kauth-5.15.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kbookmarks-5.15.0.tar.xz"; - sha256 = "1y21679a37lspwf02vy687k5najap18x7hxd8k8hssdivjvg43z8"; - name = "kbookmarks-5.15.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcmutils-5.15.0.tar.xz"; - sha256 = "0syk030b89z90aa85d1mlag613yaajipgfxxfxnp3f488s54qn6z"; - name = "kcmutils-5.15.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcodecs-5.15.0.tar.xz"; - sha256 = "1kz8vbxblzf0lxcn6c2433lhgi2iyvqsm65qxsvf5zgxckq5277p"; - name = "kcodecs-5.15.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcompletion-5.15.0.tar.xz"; - sha256 = "1mq110fg30y3xdmjicckysz3k5ylz92hz609ffjnm2svk56w5cny"; - name = "kcompletion-5.15.0.tar.xz"; - }; - }; - kconfig = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kconfig-5.15.0.tar.xz"; - sha256 = "083g4pr5sbqvpdn3ic3afbjzvczxl095rj0pi34g2b28anpwhjvn"; - name = "kconfig-5.15.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kconfigwidgets-5.15.0.tar.xz"; - sha256 = "0gkq7ifgyf7865ypxf4cwqkndn4qrp07k8wxp8fl0xa15d74nrj3"; - name = "kconfigwidgets-5.15.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcoreaddons-5.15.0.tar.xz"; - sha256 = "1v06bblxrxcwj9sbsz7xvqq6yg231m939pms8w0bbmyidsq4vpdm"; - name = "kcoreaddons-5.15.0.tar.xz"; - }; - }; - kcrash = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kcrash-5.15.0.tar.xz"; - sha256 = "1631wmg895bb4ls2mfxnlnffmzl1mjm82ad8fk361gv0s9g0xb3y"; - name = "kcrash-5.15.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdbusaddons-5.15.0.tar.xz"; - sha256 = "1w32ra4ifhb2k2k2j3dfqrrc65w0rsmj9yr34k0flqiqs0mq1pfx"; - name = "kdbusaddons-5.15.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdeclarative-5.15.0.tar.xz"; - sha256 = "06xv552v52zp9qb5v6w3cps9nm3wpacpjvm8s08zmij1y7by0z32"; - name = "kdeclarative-5.15.0.tar.xz"; - }; - }; - kded = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kded-5.15.0.tar.xz"; - sha256 = "144lfjx6gmbhqqwdv4ll1ab4rj3pcyn8bp9yp4snzh6v2a2hncwq"; - name = "kded-5.15.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kdelibs4support-5.15.0.tar.xz"; - sha256 = "1091nc3rrcq360sillynvmxwvmd209cnlql6g9x249zdxjpv62qy"; - name = "kdelibs4support-5.15.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdesignerplugin-5.15.0.tar.xz"; - sha256 = "0my6x0fx72dk65z6lajn1faxifc622msvll6jab0rk50x8ws9dwq"; - name = "kdesignerplugin-5.15.0.tar.xz"; - }; - }; - kdesu = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdesu-5.15.0.tar.xz"; - sha256 = "0cnqd0gm5xyqsqngl0x6rs0f01bilcfv8xx1ry9hfnqffv9amr9y"; - name = "kdesu-5.15.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdewebkit-5.15.0.tar.xz"; - sha256 = "1cgwhb5nr6g6y3azp2ii0hdjlvwacdr94ldlsirqmzl7rymkgkqa"; - name = "kdewebkit-5.15.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdnssd-5.15.0.tar.xz"; - sha256 = "1z5d26pmc9vmf30zz35kcl585fpjfrp8xf5r13lfwnnbfr6pnh0k"; - name = "kdnssd-5.15.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kdoctools-5.15.0.tar.xz"; - sha256 = "0vci37val64ixcz7zr99gzdqlb0ff04gdj2kad5dj32295iixhva"; - name = "kdoctools-5.15.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kemoticons-5.15.0.tar.xz"; - sha256 = "0a3izq6w3w37qd6b6w2g179w9nrh5pwh8hnc4iggyr2wwf2hfw9c"; - name = "kemoticons-5.15.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kfilemetadata-5.15.0.tar.xz"; - sha256 = "1y90azm27mnw2wfilwmg1gls21fpnd2nzvdl26vrhpsvnclf8rqn"; - name = "kfilemetadata-5.15.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kglobalaccel-5.15.0.tar.xz"; - sha256 = "1ii7bd1rf038zjimz7nd2snfi76drqdnyrkivwd6np4fdvcsyhjr"; - name = "kglobalaccel-5.15.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kguiaddons-5.15.0.tar.xz"; - sha256 = "0pfcns136i0ghk32gyr7nnq7wnk2j8rmcr3jr18f1y9pkk3ih6q8"; - name = "kguiaddons-5.15.0.tar.xz"; - }; - }; - khtml = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/khtml-5.15.0.tar.xz"; - sha256 = "01gx1qd7hhvyhzndin8kw9yg3jlz8rz7i8kxbl6wpab9sc270a70"; - name = "khtml-5.15.0.tar.xz"; - }; - }; - ki18n = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ki18n-5.15.0.tar.xz"; - sha256 = "0qy7nv4ssjbyskjhnx8sr6vg9jwg183f6zd759rzp56pz5j79qdd"; - name = "ki18n-5.15.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kiconthemes-5.15.0.tar.xz"; - sha256 = "0ab9iki3jl4izzjph9bps04w7grimyyaaxsna6j0dzg90izg1zg2"; - name = "kiconthemes-5.15.0.tar.xz"; - }; - }; - kidletime = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kidletime-5.15.0.tar.xz"; - sha256 = "0gp6grv6a9zb14yfrznwn5ih1946v500zlj5g9s8f1xw5p0792i2"; - name = "kidletime-5.15.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kimageformats-5.15.0.tar.xz"; - sha256 = "0q66w91khj4xax4nzak5r9wmr0qny5cq7dapv11zdzn7rf90bpvv"; - name = "kimageformats-5.15.0.tar.xz"; - }; - }; - kinit = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kinit-5.15.0.tar.xz"; - sha256 = "0ccf2rg6m74xj7mq4i0fsl09l2wkwyhmlfp3lvrn4714w19bj5yf"; - name = "kinit-5.15.0.tar.xz"; - }; - }; - kio = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kio-5.15.0.tar.xz"; - sha256 = "0ld56arcjms5kiz9zj3g7hgd6xq05zg2bx0qpr4aaihl3hgp6888"; - name = "kio-5.15.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kitemmodels-5.15.0.tar.xz"; - sha256 = "112a8mdxabzv7lhpxfnnz2jrib972lz6ww7gd92lqziprz78fyga"; - name = "kitemmodels-5.15.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kitemviews-5.15.0.tar.xz"; - sha256 = "1112x7lf0wvwsizcr2ij0w463cssg0ahcav872g39gzirf67lqyi"; - name = "kitemviews-5.15.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kjobwidgets-5.15.0.tar.xz"; - sha256 = "12r3j1bwvmacj70dng4g5yrgjgj4v8nizk4yf22dfy858k8v8zda"; - name = "kjobwidgets-5.15.0.tar.xz"; - }; - }; - kjs = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kjs-5.15.0.tar.xz"; - sha256 = "1aj9w8009q8bdq17ckjr1z219qy4wkjwc5xggl1879haqxn1pfg3"; - name = "kjs-5.15.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kjsembed-5.15.0.tar.xz"; - sha256 = "099m6k6m6imy7jdia822i1g6c61gp955w21m4bb5nndwdy580mj4"; - name = "kjsembed-5.15.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kmediaplayer-5.15.0.tar.xz"; - sha256 = "1rli98klmizwmmwwn6lcna7vxihd7b5yrvshisw6ivb21ygjgrxm"; - name = "kmediaplayer-5.15.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knewstuff-5.15.0.tar.xz"; - sha256 = "0s8ha0qqy007kq1k55mii5msbqxnczb57xici3in1idxjd83fjnw"; - name = "knewstuff-5.15.0.tar.xz"; - }; - }; - knotifications = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knotifications-5.15.0.tar.xz"; - sha256 = "1189xx9a5i932lfyniqnz43gl3hhjlg962j996zy0g9yasc2r3cm"; - name = "knotifications-5.15.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/knotifyconfig-5.15.0.tar.xz"; - sha256 = "0b279z1qwfhj2mnpil0jd3xs8yn4i8mvib8dws6q4nygl941b8sa"; - name = "knotifyconfig-5.15.0.tar.xz"; - }; - }; - kpackage = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpackage-5.15.0.tar.xz"; - sha256 = "03zcnqly2pb67pza9xm9n0asjixqicxwj5vnv25yvki02cgwmvn3"; - name = "kpackage-5.15.0.tar.xz"; - }; - }; - kparts = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kparts-5.15.0.tar.xz"; - sha256 = "0pjfmb97387kvvn7c4xzmxdja2jghx946ima5g8jnfw0zacsd2mw"; - name = "kparts-5.15.0.tar.xz"; - }; - }; - kpeople = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpeople-5.15.0.tar.xz"; - sha256 = "11frmba6rqn2bmqp28wrwrqw8lpkdg27v5fa5lg47vrdp4ih0rgs"; - name = "kpeople-5.15.0.tar.xz"; - }; - }; - kplotting = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kplotting-5.15.0.tar.xz"; - sha256 = "0wwqlza0qfd25p9d5gfrs0ymwzg5b0lnb4b8slfw2znazvi03krj"; - name = "kplotting-5.15.0.tar.xz"; - }; - }; - kpty = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kpty-5.15.0.tar.xz"; - sha256 = "03yl4kwhwma0nwbgww95z4853waxrq4xipy41k7224n3gvd62c30"; - name = "kpty-5.15.0.tar.xz"; - }; - }; - kross = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/kross-5.15.0.tar.xz"; - sha256 = "1mlvs0ra3ngrmrmqb4qjg3nkw5hqscdd1p3cdh94mpcwk330svq0"; - name = "kross-5.15.0.tar.xz"; - }; - }; - krunner = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/portingAids/krunner-5.15.0.tar.xz"; - sha256 = "0kyb135a45b9si4xh7pml7aiigs3j5077dgjfrghhz0ci3ibmn0v"; - name = "krunner-5.15.0.tar.xz"; - }; - }; - kservice = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kservice-5.15.0.tar.xz"; - sha256 = "13yfg99s7k7y2npj8jn12iikan95dsf8hdmqfjb59n5qg4a6h253"; - name = "kservice-5.15.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ktexteditor-5.15.0.tar.xz"; - sha256 = "161kkssai0lwssy6l4mxgclx7229bgfkfgsf973i94p6hanaymb8"; - name = "ktexteditor-5.15.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/ktextwidgets-5.15.0.tar.xz"; - sha256 = "1r9drjjlag5v7y8inswbrj2fmkzkranrnzyrwl4bl7v0l1dir2l8"; - name = "ktextwidgets-5.15.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kunitconversion-5.15.0.tar.xz"; - sha256 = "1qbps67w3ii2797q967wvy56zclsm9l6vcrwnylx9rfqygcs5ixf"; - name = "kunitconversion-5.15.0.tar.xz"; - }; - }; - kwallet = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwallet-5.15.0.tar.xz"; - sha256 = "1b97v4vad7lzrjmf04zikm4q9czyzbzkk3vdhcd2mi47vizrj392"; - name = "kwallet-5.15.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwidgetsaddons-5.15.0.tar.xz"; - sha256 = "1nbgsf5dfz0f12azw19ir7791y6ykkkj7y96ln0k81d3cbcgxq63"; - name = "kwidgetsaddons-5.15.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kwindowsystem-5.15.0.tar.xz"; - sha256 = "1x8pagby6j7k2ns3davbmyysggril0kp9ccn3326qm89l70zrf8x"; - name = "kwindowsystem-5.15.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kxmlgui-5.15.0.tar.xz"; - sha256 = "1d5mm2fkzk92q9gfh76a83mbzqw2pcagkg6s51i5ax3zqb7jnzdm"; - name = "kxmlgui-5.15.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/kxmlrpcclient-5.15.0.tar.xz"; - sha256 = "03ckqn33djzyg0ik9g1jk4dj33incsxwvvdc7g5k8wjgjcdkp433"; - name = "kxmlrpcclient-5.15.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/modemmanager-qt-5.15.0.tar.xz"; - sha256 = "1sxi32jxsz3d51nkcx7wxjyjvr2fg3qay3s3nzrpdzm0pa79drr9"; - name = "modemmanager-qt-5.15.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/networkmanager-qt-5.15.0.tar.xz"; - sha256 = "0l0396c9fgwxdv1h33p7y8w0ylvm4pa3a53yv7jckkc49nygk38p"; - name = "networkmanager-qt-5.15.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz"; - sha256 = "0v36i64jb3n6lq964417lzbdm6m57nvg83kjli4wqlc17dywjp8s"; - name = "plasma-framework-5.15.0.tar.xz"; - }; - }; - solid = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/solid-5.15.0.tar.xz"; - sha256 = "0118bynfqcgvg333ljbb80k7bkam6skc7vygwvy7fr7y4dzmlwfa"; - name = "solid-5.15.0.tar.xz"; - }; - }; - sonnet = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/sonnet-5.15.0.tar.xz"; - sha256 = "18qs5szdyvjzwlbid62g3qs7cs4fdb46n25aw49saq7drf567gm0"; - name = "sonnet-5.15.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.15.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.15/threadweaver-5.15.0.tar.xz"; - sha256 = "19ha9r6wjm93w4kh5rjaal0r91vxhsr9q82dw5b9j927zrqwb7pq"; - name = "threadweaver-5.15.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix deleted file mode 100644 index 52817921cc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905749128b1..b6b1aa750f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6860,9 +6860,8 @@ let automake = automake111x; }; - kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); kf517 = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; - kf5_stable = kf515; + kf5_stable = kf517; kf5_latest = kf517; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; @@ -12222,9 +12221,8 @@ let boost = boost155; }; - kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); kdeApps_15_12 = import ../applications/kde-apps-15.12 { inherit pkgs; }; - kdeApps_stable = kdeApps_15_08; + kdeApps_stable = kdeApps_15_12; kdeApps_latest = kdeApps_15_12; keepnote = callPackage ../applications/office/keepnote { @@ -14728,9 +14726,8 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; - plasma54 = recurseIntoAttrs (import ../desktops/plasma-5.4 { inherit pkgs; }); plasma55 = import ../desktops/plasma-5.5 { inherit pkgs; }; - plasma5_stable = plasma54; + plasma5_stable = plasma55; plasma5_latest = plasma55; kde5PackagesFun = self: with self; { @@ -14773,7 +14770,10 @@ let }; - kde5 = kf5_stable // plasma5_stable // kdeApps_stable // kde5PackagesFun kde5; + kde5 = + recurseIntoAttrs + (lib.makeScope qt55Libs.newScope (self: + kf5_stable self // plasma5_stable self // kdeApps_stable self // kde5PackagesFun self)); kde5_latest = recurseIntoAttrs From f51c54ba022f35a578e9bae5774ec4e552420435 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 19:12:39 -0600 Subject: [PATCH 498/498] kde4.kdelibs: fix link to kde5.kdelibs --- 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 b6b1aa750f5..a385f264e49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14501,7 +14501,7 @@ let libusb = libusb1; libcanberra = libcanberra_kde; boost = boost155; - kdelibs = kdeApps_15_08.kdelibs; + kdelibs = kde5.kdelibs; subversionClient = pkgs.subversion18.override { bdbSupport = false; perlBindings = true;