From 73058eb94658fdcb825ea5934a06c52d445a262c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Nov 2015 16:44:43 +0100 Subject: [PATCH 001/212] 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 0ca454570be6c55395f767a8606f29f11222ad1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 30 Nov 2015 17:18:03 +0100 Subject: [PATCH 002/212] 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 003/212] 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 474d64eecf8df4d62a1ed02f88c2b612f8e727d8 Mon Sep 17 00:00:00 2001 From: Evan Danaher Date: Wed, 2 Dec 2015 23:43:53 -0500 Subject: [PATCH 004/212] 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 005/212] 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 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 006/212] 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 007/212] 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 008/212] 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 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 009/212] 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 b789856ce3bb4029d24acf90c321d0f36d4971f9 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 14:23:23 +0000 Subject: [PATCH 010/212] 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 e8d97ef4f575dfa14fd9421ce3700f4db306a636 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 7 Dec 2015 15:06:53 +0000 Subject: [PATCH 011/212] 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 012/212] 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 ca659e0e89d3a8e548785fe10b30c4583403ec4c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 6 Dec 2015 18:13:31 +0100 Subject: [PATCH 013/212] 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 014/212] 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 85c051b2f3d34377e8c574925d563fc2a356ce26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Dec 2015 02:34:09 +0000 Subject: [PATCH 015/212] 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 80720501cb130978bef9022fdf5b977f90b34d93 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Tue, 8 Dec 2015 11:11:14 +0100 Subject: [PATCH 016/212] 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 017/212] 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 018/212] 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 019/212] 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 020/212] 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 021/212] 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 022/212] 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 023/212] 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 024/212] 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 025/212] 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 026/212] 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 027/212] 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 028/212] 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 029/212] 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 030/212] 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 031/212] 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 032/212] 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 033/212] 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 034/212] 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 035/212] 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 036/212] 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 037/212] 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 038/212] 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 039/212] 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 040/212] 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 041/212] 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 042/212] 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 043/212] 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 044/212] 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 045/212] 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 046/212] 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 6db67186f2ea8dd6cd5fb3a048dd9facd749c81a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Dec 2015 07:30:15 +0200 Subject: [PATCH 047/212] 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 048/212] 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 049/212] 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 050/212] 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 051/212] 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 052/212] 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 053/212] 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 054/212] 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 055/212] 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 056/212] 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 057/212] 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 058/212] 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 0956820a55fda5d784ef5be33bae5de863cadfbc Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Wed, 9 Dec 2015 14:33:16 +0100 Subject: [PATCH 059/212] 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 060/212] 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 061/212] 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 062/212] 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 a5a481e7ee6af1c52d72f6cda48f7db3969e50d1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 9 Dec 2015 23:28:31 +0300 Subject: [PATCH 063/212] 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 064/212] 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 065/212] 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 066/212] 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 067/212] 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 068/212] 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 069/212] 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 070/212] 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 071/212] 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 072/212] 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 073/212] 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 074/212] 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 075/212] 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 076/212] 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 077/212] 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 078/212] 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 079/212] 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 080/212] 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 081/212] 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 082/212] 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 083/212] 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 084/212] 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 085/212] 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 086/212] 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 087/212] 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 088/212] 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 089/212] 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 090/212] 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 091/212] 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 092/212] 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 093/212] 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 094/212] 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 095/212] 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 096/212] 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 097/212] 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 098/212] 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 099/212] 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 100/212] 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 101/212] 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 102/212] 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 6037db59c6cf946aee0b1ba3f1b66558539a18d9 Mon Sep 17 00:00:00 2001 From: Stewart Mackenzie Date: Fri, 11 Dec 2015 02:19:12 +0800 Subject: [PATCH 103/212] 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 104/212] 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 105/212] 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 106/212] 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 107/212] 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 108/212] 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 109/212] 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 110/212] 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 111/212] 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 112/212] 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 113/212] 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 114/212] 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 115/212] 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 116/212] 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 117/212] 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 118/212] 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 119/212] 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 120/212] 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 121/212] 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 122/212] 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 123/212] 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 124/212] 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 125/212] 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 126/212] 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 127/212] 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 128/212] 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 129/212] 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 130/212] 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 131/212] 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 132/212] 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 133/212] 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 d2b7b5660b14525b27b1eb90082e8cdd130c6031 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Dec 2015 11:20:16 +0100 Subject: [PATCH 134/212] 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 135/212] 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 136/212] 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 137/212] 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 138/212] 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 139/212] 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 140/212] 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 141/212] 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 142/212] 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 143/212] 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 144/212] 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 145/212] 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 146/212] 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 147/212] 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 148/212] 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 149/212] 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 150/212] 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 151/212] 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 152/212] 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 153/212] 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 154/212] 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 155/212] 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 156/212] 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 157/212] 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 158/212] 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 159/212] 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 160/212] 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 161/212] 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 162/212] 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 163/212] 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 164/212] 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 165/212] 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 166/212] 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 167/212] 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 168/212] 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 169/212] 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 170/212] 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 171/212] 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 172/212] 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 173/212] 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 174/212] 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 175/212] 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 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 176/212] 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 177/212] 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 178/212] 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 179/212] 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 180/212] 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 181/212] 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 182/212] 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 183/212] 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 184/212] 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 7200a5c07904791b78987fe02775f52386b32a14 Mon Sep 17 00:00:00 2001 From: David A Roberts Date: Fri, 11 Dec 2015 22:35:17 +1000 Subject: [PATCH 185/212] 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 06:58:51 -0600 Subject: [PATCH 186/212] 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 187/212] 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 188/212] 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 77463eec42bcb5b3406b62d1a105986049eb887d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Nov 2015 19:02:03 +0000 Subject: [PATCH 189/212] 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 190/212] 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 191/212] 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 178c20f0f6f9427d32aaa28fec90174bccc743bf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 12 Dec 2015 08:57:56 -0500 Subject: [PATCH 192/212] 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 193/212] 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 194/212] 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 492541c37840978886d357125bf260e5cf3e8246 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Dec 2015 17:01:23 +0100 Subject: [PATCH 195/212] 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 196/212] 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 197/212] 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 198/212] 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 199/212] 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 200/212] 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 201/212] 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 6734127545570274acefbabd5c6259822f231a24 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Nov 2015 02:44:56 +0100 Subject: [PATCH 202/212] 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 203/212] 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 9f71bba8a482bfd6347f50423f04bae908c78d16 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sat, 12 Dec 2015 12:24:21 -0800 Subject: [PATCH 204/212] 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 205/212] 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 206/212] 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 207/212] 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 208/212] 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 209/212] 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 210/212] 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 211/212] 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 212/212] 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 = []; }; }